More improvements to comments.