* Corrected some bugs.