fix some bugs.!