final commit

javadoc fixed