Lots of changes. Most of them to the Makefile