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

bulk comment fixes