Bug fixs
Exercise 9 and 10