diff --git a/1984/anonymous/.entry.json b/1984/anonymous/.entry.json
index 2b761edef..f96938dcd 100644
--- a/1984/anonymous/.entry.json
+++ b/1984/anonymous/.entry.json
@@ -47,7 +47,7 @@
 	    "OK_to_edit" : true,
 	    "display_as" : "image",
 	    "display_via_github" : false,
-	    "entry_text" : "source code tattoo image"
+	    "entry_text" : "source code and tattoo image"
 	},
 	{
 	    "file_path" : "1984_anonymous.tar.bz2",
diff --git a/1984/anonymous/index.html b/1984/anonymous/index.html
index 1ccd2e0c4..57508ee11 100644
--- a/1984/anonymous/index.html
+++ b/1984/anonymous/index.html
@@ -470,7 +470,7 @@ ends in a smily face: <code>;}</code>.</p>
 <li><a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1984/anonymous/Makefile">Makefile</a> - entry Makefile</li>
 <li><a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1984/anonymous/anonymous.alt.c">anonymous.alt.c</a> - alternate source code</li>
 <li><a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1984/anonymous/anonymous.orig.c">anonymous.orig.c</a> - original source code</li>
-<li><a href="1984-anonymous-tattoo.jpg">1984-anonymous-tattoo.jpg</a> - source code tattoo image</li>
+<li><a href="1984-anonymous-tattoo.jpg">1984-anonymous-tattoo.jpg</a> - source code and tattoo image</li>
 </ul>
 <h2 id="secondary-files">Secondary files</h2>
 <ul>
diff --git a/1984/mullender/.entry.json b/1984/mullender/.entry.json
index 55c1495da..60c731e00 100644
--- a/1984/mullender/.entry.json
+++ b/1984/mullender/.entry.json
@@ -56,7 +56,7 @@
 	    "OK_to_edit" : true,
 	    "display_as" : "c",
 	    "display_via_github" : true,
-	    "entry_text" : "header file for gentab.c for compatibility with 1984 systems"
+	    "entry_text" : "gentab.c header file for compatibility with systems in 1984"
 	},
 	{
 	    "file_path" : "1984_mullender.tar.bz2",
diff --git a/1984/mullender/index.html b/1984/mullender/index.html
index 7dba70bbb..9046afafe 100644
--- a/1984/mullender/index.html
+++ b/1984/mullender/index.html
@@ -778,7 +778,7 @@ the comment to <code>&amp;&amp;</code>.</p>
 <li><a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1984/mullender/mullender.alt.c">mullender.alt.c</a> - alternate source code</li>
 <li><a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1984/mullender/mullender.orig.c">mullender.orig.c</a> - original source code</li>
 <li><a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1984/mullender/gentab.c">gentab.c</a> - author tool to generate code</li>
-<li><a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1984/mullender/a.out.h">a.out.h</a> - header file for gentab.c for compatibility with 1984 systems</li>
+<li><a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1984/mullender/a.out.h">a.out.h</a> - gentab.c header file for compatibility with systems in 1984</li>
 </ul>
 <h2 id="secondary-files">Secondary files</h2>
 <ul>
diff --git a/1985/shapiro/README.md b/1985/shapiro/README.md
index 31e04eaeb..b51b92459 100644
--- a/1985/shapiro/README.md
+++ b/1985/shapiro/README.md
@@ -55,7 +55,7 @@ in your head.
 
 ## Judges' remarks:
 
-As submitted, this program was 3 lines (2 of defines and 1 of code).
+As submitted, this program was 3 lines (two `#define`s, one code).
 To make news & mail happy we split the last line into seven lines.
 
 This program was selected for the 1987 t-shirt collection.
diff --git a/1985/shapiro/index.html b/1985/shapiro/index.html
index 32078511e..3d76c9bcc 100644
--- a/1985/shapiro/index.html
+++ b/1985/shapiro/index.html
@@ -419,7 +419,7 @@ in the input.</p>
 <p>Also try printing out various sized mazes and solving them with pencil or pen or
 in your head.</p>
 <h2 id="judges-remarks">Judges’ remarks:</h2>
-<p>As submitted, this program was 3 lines (2 of defines and 1 of code).
+<p>As submitted, this program was 3 lines (two <code>#define</code>s, one code).
 To make news &amp; mail happy we split the last line into seven lines.</p>
 <p>This program was selected for the 1987 t-shirt collection.</p>
 <p>We found this program is be simply a<strong>maze</strong>ing! Run this program without
diff --git a/tmp/manifest.csv b/tmp/manifest.csv
index e1f70d730..586604522 100644
--- a/tmp/manifest.csv
+++ b/tmp/manifest.csv
@@ -3,7 +3,7 @@
 1984,anonymous,Makefile,30,true,makefile,true,entry Makefile
 1984,anonymous,anonymous.alt.c,40,true,c,true,alternate source code
 1984,anonymous,anonymous.orig.c,50,false,c,true,original source code
-1984,anonymous,1984-anonymous-tattoo.jpg,100,true,image,false,source code tattoo image
+1984,anonymous,1984-anonymous-tattoo.jpg,100,true,image,false,source code and tattoo image
 1984,anonymous,1984_anonymous.tar.bz2,1415926535,false,tbz2,false,download entry tarball
 1984,anonymous,README.md,4000000000,true,markdown,true,markdown source for this web page
 1984,anonymous,.entry.json,4000000000,true,json,true,entry summary and manifest in JSON
@@ -35,7 +35,7 @@
 1984,mullender,mullender.alt.c,40,true,c,true,alternate source code
 1984,mullender,mullender.orig.c,50,false,c,true,original source code
 1984,mullender,gentab.c,150,true,c,true,author tool to generate code
-1984,mullender,a.out.h,160,true,c,true,header file for gentab.c for compatibility with 1984 systems
+1984,mullender,a.out.h,160,true,c,true,gentab.c header file for compatibility with systems in 1984
 1984,mullender,1984_mullender.tar.bz2,1415926535,false,tbz2,false,download entry tarball
 1984,mullender,README.md,4000000000,true,markdown,true,markdown source for this web page
 1984,mullender,.entry.json,4000000000,true,json,true,entry summary and manifest in JSON
diff --git a/tmp/manifest.numbers b/tmp/manifest.numbers
index c8e469fb1..a43e99bc0 100644
Binary files a/tmp/manifest.numbers and b/tmp/manifest.numbers differ