Updated some javadoc