last bug fixed and makefiles