Cleaning up, fixing makefile