Update notes and TODOs