Preparing to release new version. Tidy up on javadoc