Update Makefile & Roadmap