Simplify and extend Makefile and bin/crystal to support development.