A bunch of edits done in person.