Fixing stuff
Fixing a bunch of horrible things