added some javadoc comments