fixed a lot of things