some missed changes, makefiles