Fixed a lot of things in the Makefile