new makefile and others changes