Fixing a bunch of crap I broke.... lol