modify some bugs