- fix some bugs