Somehow the first fix also stopped the demo from being completed? even though it used to work just fine and nothing changed code wise for that.

another round of fixes later and you can actualy get the 2nd scene and end of demo messages again