Updated roadmap and todo