Updated TODO and some text fixes