Update Makefile

more last minute changes.. cleanup..