changes / reorganizing the makefile, also changes some defaults