Comments & e-notice fixes
comments & formatting fixes
comment fixes
Merge pull request #3161 from eileenmcnaughton/tests

Comments, formatting, e-notices