fixing makefiles etc..