Quiz 3, and updates to week 2 stuff