Fixed a bunch of random stuff