fix some bugs
commit for experiment