another editing pass

See inline comments below.