Fixed some glaring mistakes