Week #6 Exercise 8 and other tweeks