Update TODO and Roadmap.md