Makefile improvements
edit the demo