Update TODO/README some more