Updated some javadocs