Updated TODO notes