fixed a lot bug