fixing a bunch of shit