Updated notes and Todos