Some edits

Various edits I've made.