Fixed a few glaring issues