improved (again) Makefile
improved (re-again) Makefile