Fix issues 1,2,5,6,7 of Roadmap