fixed a lot of different things