Update clean some bugs