New javadoc and re-formated old javadoc slightly