updated TODO, fixed info