Updated notes and TODO