Fix some stuff and add Exercise 6