Xu guo

clean some bugs