Updated TODO and library.