Updated some of the javadoc