modify some bugs
adjust