Various edits.