Final project

minor fixes
javadoc