A couple more edits