Assorted edits