added some javadoc comments and some non-javadoc comments