Added/Modified some of the javadoc.