Fixed a whole bunch of things