Clean up and act on edit points.

This PR is based on #1 and removes the editorial comments from the README. My rationale for the changes are primarily described in the discussion of the previous PR. Merging this will also merge #1.