yet more edits