Broken, but pretty, new Makefile
Accidentally a line
Finished Makefile and compatibility fixes