Notes from code review

Kenneth Morelandrequested to merge
kmorel/point-merge:code-review-1 into master

Various changes and notes from our first code review.

Merge request reports