Fixed a bunch of stuff. Spent several hours chasing down a bug that didn't even exist. Oh god.