Fixed the mistakes, hopefully.