fix a bunch of shit