Finishing round 2 of edits.