Lots of notes and updates