- Fixed some things