Update notes and TODO