Quick Chapter 2 Scene Fixes

Fixes #356
Merge pull request #368 from Kiroshima/master

Quick Chapter 2 Scene Fixes