improvements to Makefile