More improvements to comments and Javadocs