updated TODO list and comments