fix and add some notes