gab - Lesson 11 - fixed several small issues