updated makefile and assorted