a couple of copy-edits before merging [ci skip]