Updated some javadoc
Updated to changes made on Monday