Update some more Javadoc and formatting