fixing a lot of shit