#5 Improved Java Doc
#8 Codebase Cleanup