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

bulk comment fixes