diff --git a/README.md b/README.md
index ba17ca95..b0c2b141 100644
--- a/README.md
+++ b/README.md
@@ -8,10 +8,13 @@ for Java 8
 [Click here](https://github.com/BruceEckel/TIJ4-Refreshed-Examples/archive/master.zip) to download the zip file. Unzip the file into a directory of your choice.
 
 ## Build the Examples ##
-1. Install the latest version of Java 8 (JDK8). (Use 32-bit version on Windows).
+1. Install the latest version of Java 8 (JDK8). (Use the 32-bit version on Windows because of some library issues).
 
 1. Install Apache Ant. Follow the instructions [here](https://ant.apache.org/manual/install.html#getting).
 
 1. Add the path to the directory where you unpacked the examples to your CLASSPATH.
 
-1. Start a command prompt in the directory where you installed the examples. If your installation is successful, you should be able to type **ant build** and build everything. **ant run** will build AND run the examples. You may initially get some error messages telling you to install additional packages, but eventually you should get through the whole build process successfully.
+1. Start a command prompt in the directory where you installed the examples. If your installation is successful, you should be able to type **ant build** and build everything. **ant run** will build AND run the examples. You will initially get some error messages instructing you to install specified packages, but eventually you should get through the whole build process successfully.
+
+
+Report bugs in the examples or in the book [here](https://github.com/BruceEckel/TIJ4-Refreshed-Examples/issues).
\ No newline at end of file
diff --git a/obsolete/InterfaceExtractorProcessor.java b/annotations/InterfaceExtractorProcessor.java
similarity index 100%
rename from obsolete/InterfaceExtractorProcessor.java
rename to annotations/InterfaceExtractorProcessor.java
diff --git a/obsolete/InterfaceExtractorProcessorFactory.java b/annotations/InterfaceExtractorProcessorFactory.java
similarity index 60%
rename from obsolete/InterfaceExtractorProcessorFactory.java
rename to annotations/InterfaceExtractorProcessorFactory.java
index 5ed41e32..a5025633 100644
--- a/obsolete/InterfaceExtractorProcessorFactory.java
+++ b/annotations/InterfaceExtractorProcessorFactory.java
@@ -1,15 +1,15 @@
 //: annotations/InterfaceExtractorProcessorFactory.java
 // APT-based annotation processing.
 package annotations;
-/*import com.sun.mirror.apt.*;
-import com.sun.mirror.declaration.*;*/
+import com.sun.mirror.apt.*;
+import com.sun.mirror.declaration.*;
 import java.util.*;
 
 public class InterfaceExtractorProcessorFactory
-  implements javax.annotation.processing.Processor {
-  public javax.annotation.processing.Processor getProcessorFor(
-    Set<javax.lang.model.element.TypeElement> atds,
-    javax.annotation.processing.ProcessingEnvironment env) {
+  implements AnnotationProcessorFactory {
+  public AnnotationProcessor getProcessorFor(
+    Set<AnnotationTypeDeclaration> atds,
+    AnnotationProcessorEnvironment env) {
     return new InterfaceExtractorProcessor(env);
   }
   public Collection<String> supportedAnnotationTypes() {
diff --git a/annotations/build.xml b/annotations/build.xml
index 536420f4..e6b51b3e 100644
--- a/annotations/build.xml
+++ b/annotations/build.xml
@@ -153,7 +153,7 @@
      fork="true"/>
   </target>
 
-  <!-- <target name="TableCreator">
+  <target name="TableCreator">
     <java
      classname="annotations.database.TableCreator"
      classpath="${java.class.path};${basedir};${basedir}/.."
@@ -184,7 +184,7 @@
       <arg value="-s"/>
       <arg value="database"/>
     </exec>
-  </target> -->
+  </target>
 
   <target
    depends="build"
@@ -203,8 +203,8 @@
     <antcall target="StackLStringTest"/>
     <antcall target="UseCaseTracker"/>
     <antcall target="TableCreator"/>
-    <!-- <antcall target="InterfaceExtractorProcessor"/>
-    <antcall target="TableCreationProcessorFactory"/> -->
+    <antcall target="InterfaceExtractorProcessor"/>
+    <antcall target="TableCreationProcessorFactory"/>
     <delete file="failures"/>
   </target>
 
diff --git a/obsolete/database/Constraints.java b/annotations/database/Constraints.java
similarity index 100%
rename from obsolete/database/Constraints.java
rename to annotations/database/Constraints.java
diff --git a/obsolete/database/DBTable.java b/annotations/database/DBTable.java
similarity index 100%
rename from obsolete/database/DBTable.java
rename to annotations/database/DBTable.java
diff --git a/obsolete/database/Member.java b/annotations/database/Member.java
similarity index 100%
rename from obsolete/database/Member.java
rename to annotations/database/Member.java
diff --git a/obsolete/database/SQLInteger.java b/annotations/database/SQLInteger.java
similarity index 100%
rename from obsolete/database/SQLInteger.java
rename to annotations/database/SQLInteger.java
diff --git a/obsolete/database/SQLString.java b/annotations/database/SQLString.java
similarity index 100%
rename from obsolete/database/SQLString.java
rename to annotations/database/SQLString.java
diff --git a/obsolete/database/TableCreationProcessorFactory.java b/annotations/database/TableCreationProcessorFactory.java
similarity index 100%
rename from obsolete/database/TableCreationProcessorFactory.java
rename to annotations/database/TableCreationProcessorFactory.java
diff --git a/obsolete/database/TableCreator.java b/annotations/database/TableCreator.java
similarity index 100%
rename from obsolete/database/TableCreator.java
rename to annotations/database/TableCreator.java
diff --git a/obsolete/database/Uniqueness.java b/annotations/database/Uniqueness.java
similarity index 100%
rename from obsolete/database/Uniqueness.java
rename to annotations/database/Uniqueness.java
diff --git a/xml/build.xml b/xml/build.xml
index 89761863..b44fa1b2 100644
--- a/xml/build.xml
+++ b/xml/build.xml
@@ -46,7 +46,7 @@
      classname="People"
      classpath="${java.class.path};${basedir};${basedir}/.."
      dir="../xml/"
-     failonerror="false"
+     failonerror="true"
      fork="true"/>
   </target>