Update terminology, clean up Thesis Statement section.