Makes some minor wordsmith edits.
Folds in comments by Dan.