Fixed a whole ton of stuff and changed methods