Fixed a few things!