minor issues and javadoc update