updated TODO and goals