Updated TODO list and output