Add more changes from second draft edits