Updated some of the javaDocs