makefile and corrections