Fixing a bunch of shit...