cleaned up makefile, fixed main file