updated TODO some more