Changed makefile and such