+fix some bugs