fixed a bunch of things mostly formatting