fixed a lot more