- Fixed some errors