* Fixed some bugs