Edits from last time
Finished up last of notes