Updating: changing some Makefiles.