Update TODO and needed fixes