Finished Exercise 8 and two bugs