A few edits, but mostly adding notes for the next serious writing pass in TODO.