Chapter 3 changes

lots of small improvements
Merge pull request #365 from shaitanelnifi/master

Chapter 3 changes
Merge pull request #364 from Kiroshima/master

Chapter 4 Scene Setups
chapter 3cafe, chapter 1 layer

chapter 3cafe, chapter 1 layer
Chapter 3 Fixes

Also a Merge