More minor edits

Yet more minor edits to the main version, but I believe I am ready to
move on from here.