fixed a bunch of stuffs