fix many bug..