Yet another round of edits