documentation and comment corrections

[feckertson]

This PR only modifies comments. It is mainly to rule out build failures for other PRs.

[kevina]

Thanks for the corrections. Merged by cherry-picking the commit into master.