Updated Makefile to work with all .cpp's in dir; fixed some errors necessary for compilation