Greatly simplifying the makefile
Major updates