fix some bugs, change some paras