added/updated javadoc comments