Adding a few speakers, cleaning up lesson 2 files