Add more changes from second draft edits
Merge more in-school work