fixed a bunch of broken shit