Improve Makefile and run script to support development.