change some bugs