Update some notes and comments