fixed a bunch