Fixed a bunch of stuff.
Fixed some git issues.