Updated javadoc
Minor updates