Yet more edits