added some javadoc comments, other comments