Cleaned up makefile, added comments, ready to turn in