diff --git a/.gitignore b/.gitignore
index 3412076c..64e591f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,9 +2,8 @@
 .vscode/
 .gradle/
 node_modules/
-buildJvm/
-
-build.gradle
+buildJvm/bin
+buildJvm/*/build/
 
 .classpath
 .project
diff --git a/63_Name/java/main.class b/63_Name/java/Name.java
similarity index 98%
rename from 63_Name/java/main.class
rename to 63_Name/java/Name.java
index db01b014..7b67f489 100644
--- a/63_Name/java/main.class
+++ b/63_Name/java/Name.java
@@ -1,7 +1,7 @@
 import java.util.Arrays;
 import java.util.Scanner;
 
-public class main {
+public class Name {
 
     public static void printempty() { System.out.println(" "); }
 
diff --git a/66_Number/java/main.class b/66_Number/java/1/Number.java
similarity index 100%
rename from 66_Number/java/main.class
rename to 66_Number/java/1/Number.java
diff --git a/66_Number/java/Number.java b/66_Number/java/2/Number.java
similarity index 100%
rename from 66_Number/java/Number.java
rename to 66_Number/java/2/Number.java
diff --git a/84_Super_Star_Trek/README.md b/84_Super_Star_Trek/README.md
index 77fae3d8..e47c90b7 100644
--- a/84_Super_Star_Trek/README.md
+++ b/84_Super_Star_Trek/README.md
@@ -88,6 +88,17 @@ The relation between the Historical and Standard nomenclatures is shown in the s
 
 15. This version of Star Trek was created for a Data General Nova 800 system with 32K or core. So that it would fit, the instructions are separated from the main program via a CHAIN. For conversion to DEC BASIC-PLUS, Statement 160 (Randomize) should be moved after the return from the chained instructions, say to Statement 245. For Altair BASIC, Randomize and the chain instructions should be eliminated.
 
+---
+#### Bugs
+
+Many of the programs in this book and this collection have bugs in the original code. 
+
+@jkboyce has done a great job of discovering and fixing a number of bugs in the [original code](superstartrek.bas), as part of his [python implementation](python/superstartrek.py), which should be noted by other implementers:
+
+- line `4410` : `D(7)` should be `D(6)`
+- lines `8310`,`8330`,`8430`,`8450` : Division by zero is possible
+- line `440` : `B9` should be initialised to 0, not 2
+
 ---
 
 As published in Basic Computer Games (1978):