Another pass of edits and updates.