First round of Lee edits.