Makefile fixes for 'make dist' target
Updated  roadmap