Update roadmap to reflect more what's going on