and more edits