Improvements on the Masterclass

[heckelmann]

For the current Masterclass, we considered the following enhancements.

• [x] #83
• [ ] #84
• [x] #85
• [x] #86
• [x] #87
• [ ] #88