fixed a lot of shiet