add missing comment blocks
fix commen & remove a couple of unused assignments
Merge pull request #3293 from eileenmcnaughton/comments

add missing comment blocks