beefing up makefiles