Finished lesson 12 and fixed some previous bugs