100%

fix some bugs