Patch up readme.
Reorg and cleanup TODO.