misc improvements to Makefile