Modified some bugs.