updated Makefile and scaffolding