Commit some excellent progress on the display of the comments.