Fixed some of the things!