and some more fiddling with the makefile