*Fixed some bugs