minor edits, mostly comment clarifications
Merge remote-tracking branch 'upstream/master'