Another round of edits