updated comments and javadoc