Rework of Scene 2

Lots of changes and adaptions, as scene 2 worked not
properly when directly played after scene 1. This
issue needs monitoring. It may be the case that all scenes
are affected and need a rework!