fix some bugs
fixed