some corrections + update roadmap