Fixed javadoc
tweaks