fixed a bunch of random shit