bulk comment fixes
Merge pull request #3211 from eileenmcnaughton/comments

bulk comment fixes