added/updated javadoc comments
added/updated javadoc comments