minor changes

just some clean-up, mostly in comments
Merge remote-tracking branch 'origin/master'