Update roadmap
Improve comments