updated makefile and other stuff