Lesson 16 done + minor changes