makefile and build updates