Updated README and TODOs