further improvements to makefile