Updated TODO and fixed example.