Update README and TODOs