updated TODO's