Added and corrected some javadoc entries