fixed up makefiles a bit