Fixed a bunch of things #bestcommitever.