Fixed some things!