Numerous changes in Makefile