Fixed small errors. 
Removed unused imports.
Fixed comments/javadoc and generated javadoc.