Fixed makefile to build on Linux, more cleanup