README and TODO updates 2