A few edits, and remove notes.