Fixed a few a few things