- Fixed some major bugs