Fix scene 4's behavior. Fix a couple details in other scenes.
Merge branch 'robert'