Edits and more notes