fixed many bug
fixed many bug