List TODO and fix