cleaned up Makefile
updates - still working on it