some bugs solving.