template, driver, and makefile updates