fix bad parametization and clean up Makefile logic