New Makefile and minor changes