More improvements in the comments.