Updating and adding javadocs