more tweaks to Makefile