Updating roadmap and some syntax fixes