fixed a lot of mode