Comment and javadoc update