fixed a bunch of shit