Correct all the mistakes