Various edits/notes.