fixed all of the mistakes