cleanup in Makefile, minor changes