Finished almost everything
Fixed makefile