fixed a lot!