A few more edits