Fixed a lot of things.

(and broke my Git?)