changes mainly involving tweaks to the makefile