round 2 of johns edits.