Assorted edits
assorted edits