changed some bugs.