Comment block fixes
Merge pull request #3208 from eileenmcnaughton/comments

Comment block fixes