diff --git a/faq.html b/faq.html
index efb7fd634..c4fbfd932 100644
--- a/faq.html
+++ b/faq.html
@@ -432,8 +432,7 @@
 <li><a href="#faq3_17">3.17 - How do I compile and install ImageMagick for entries that require it?</a></li>
 <li><a href="#faq3_18">3.18 - How do I compile and install OpenGL for entries that require it?</a></li>
 <li><a href="#faq3_19">3.19 - What kind of make(1) compatibility does the IOCCC support and will it support other kinds?</a></li>
-<li><a href="#faq3_20">3.20 - How do I download individual winning entries or all winning entries of
-a given year?</a></li>
+<li><a href="#faq3_20">3.20 - How do I download individual winning entries or all winning entries of a given year?</a></li>
 </ul>
 <h2 id="section-4---changes-made-to-ioccc-entries">Section 4 - <a href="#faq4">Changes made to IOCCC entries</a></h2>
 <ul>
@@ -463,9 +462,9 @@ other inconsistencies with the original entry?</a></li>
 <li><a href="#faq6_2">6.2 - May I mirror the IOCCC website?</a></li>
 <li><a href="#faq6_3">6.3 - May I use parts of the IOCCC in an article, book, newsletter, or instructional material?</a></li>
 <li><a href="#faq6_4">6.4 - Why do you sometimes use the first person plural?</a></li>
-<li><a href="#faq6_5">6.5 - What is an author handle?</a></li>
-<li><a href="#faq6_6">6.6 - What is a author_handle.json file and how are they used?</a></li>
-<li><a href="#faq6_7">6.7 - What is a entry_id?</a></li>
+<li><a href="#faq6_5">6.5 - What is an <code>author handle</code>?</a></li>
+<li><a href="#faq6_6">6.6 - What is an author_handle.json file and how are they used?</a></li>
+<li><a href="#faq6_7">6.7 - What is an <code>entry_id</code>?</a></li>
 <li><a href="#faq6_8">6.8 - What is the purpose of the .top, .year and .path files?</a></li>
 <li><a href="#faq6_9">6.9 - What is the current meaning of the IOCCC terms Author, Entry, and Submission?</a></li>
 <li><a href="#faq6_10">6.10 - How does someone make a change to a file and submit that change as a GitHub pull request?</a></li>
@@ -2509,7 +2508,7 @@ in the case of <a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master
 <pre><code>    Anonymous_[0-9][0-9][0-9][0-9][.0-9]*$</code></pre>
 <div id="faq6_6">
 <div id="author_json">
-<h3 id="faq-6.6-what-is-a-author_handle.json-file-and-how-are-they-used">FAQ 6.6: What is a author_handle.json file and how are they used?</h3>
+<h3 id="faq-6.6-what-is-an-author_handle.json-file-and-how-are-they-used">FAQ 6.6: What is an author_handle.json file and how are they used?</h3>
 </div>
 </div>
 <p><strong>TL:DR</strong>: The contents of these JSON files contain the best known
@@ -2821,7 +2820,7 @@ and/or correct IOCCC author information.</p>
 <div id="faq6_7">
 <!-- we cannot use id="entry_id" because of a header in FAQ 6.6 -->
 <div id="entry_id_faq">
-<h3 id="faq-6.7-what-is-a-entry_id">FAQ 6.7: What is a entry_id?</h3>
+<h3 id="faq-6.7-what-is-an-entry_id">FAQ 6.7: What is an <code>entry_id</code>?</h3>
 </div>
 </div>
 <p>A <code>entry_id</code> is a string that identifies a winning entry of the IOCCC.</p>
diff --git a/faq.md b/faq.md
index 8c3cfb863..2f5e2a7fd 100644
--- a/faq.md
+++ b/faq.md
@@ -49,8 +49,7 @@
 - [3.17 - How do I compile and install ImageMagick for entries that require it?](#faq3_17)
 - [3.18 - How do I compile and install OpenGL for entries that require it?](#faq3_18)
 - [3.19 - What kind of make&#x28;1&#x29; compatibility does the IOCCC support and will it support other kinds?](#faq3_19)
-- [3.20 - How do I download individual winning entries or all winning entries of
-a given year?](#faq3_20)
+- [3.20 - How do I download individual winning entries or all winning entries of a given year?](#faq3_20)
 
 
 ## Section  4 - [Changes made to IOCCC entries](#faq4)
@@ -80,9 +79,9 @@ other inconsistencies with the original entry?](#faq4_3)
 - [6.2  - May I mirror the IOCCC website?](#faq6_2)
 - [6.3  - May I use parts of the IOCCC in an article, book, newsletter, or instructional material?](#faq6_3)
 - [6.4  - Why do you sometimes use the first person plural?](#faq6_4)
-- [6.5  - What is an author handle?](#faq6_5)
-- [6.6  - What is a author_handle.json file and how are they used?](#faq6_6)
-- [6.7  - What is a entry_id?](#faq6_7)
+- [6.5  - What is an `author handle`?](#faq6_5)
+- [6.6  - What is an author_handle.json file and how are they used?](#faq6_6)
+- [6.7  - What is an `entry_id`?](#faq6_7)
 - [6.8 -  What is the purpose of the .top, .year and .path files?](#faq6_8)
 - [6.9 -  What is the current meaning of the IOCCC terms Author, Entry, and Submission?](#faq6_9)
 - [6.10 - How does someone make a change to a file and submit that change as a GitHub pull request?](#faq6_10)
@@ -3093,7 +3092,7 @@ Anonymous `author_handle`'s match this regexp:
 
 <div id="faq6_6">
 <div id="author_json">
-### FAQ 6.6: What is a author_handle.json file and how are they used?
+### FAQ 6.6: What is an author_handle.json file and how are they used?
 </div>
 </div>
 
@@ -3633,7 +3632,7 @@ and/or correct IOCCC author information.
 <div id="faq6_7">
 <!-- we cannot use id="entry_id" because of a header in FAQ 6.6 -->
 <div id="entry_id_faq">
-### FAQ 6.7: What is a entry_id?
+### FAQ 6.7: What is an `entry_id`?
 </div>
 </div>