Lazyfoo Lesson20 + Minor improvements