clean some bugs