makefile and little changes