Generation errors corrected. Also, a missing JAR file added.