lesson 8 fixes