Updated TODO list/comments