improved Makefile;