Updated TODO and documentation