Fixed a bunch of bugs and did a ton of stuff