commit

fix some bugs