fixed up makefiles