Misc changes in comments