More changes to the Makefile and template