- Fixed some bugs
