Revised TODO and such