Additions to second review edits

This addresses some of the "TODO" items in the second review PR, primarily dealing with coordinates. Many of these were prompted by @mservillat's comments.