Altered Makefile, cleaned up clang errors