exercise 12 - bonus fixes