Fixed a few more things up