Fixing some issues on linux, new Makefile!