Assorted edits to clean up