some comment block fixes
Merge pull request #3284 from eileenmcnaughton/comments

some comment block fixes