Fixed a ton of stuff