Update roadmap

Reflects what is done, and adjusted prioriteis.