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

bulk comment fixes