fixed a bunch of stufffffff