Updated TODO and fixed #8