Lesson 3 and fixes to Lesson 02