Lesson 7 fixes and solution

1 job for master in 1 minute and 38 seconds (queued for 9 seconds)