updated TODO and other stuff