First round of edits.