Fixed some bugs
Fixed