Added Exercise 12 and a few fixes