Lots of notes updates