improvements to Makefile, (closes #27 and closes #29)