Quick Chapter 2 Scene Fixes

Fixes #356