Edit javadoc, some comments.