One-pass of revisions

I think I got the PR right this time :+1: