Merge pull request #3343 from bwiklund/comment-edits

small batch of edits/corrections to comments