More Chapter 2 fixes

mostly positioning and such
Merge pull request #357 from shaitanelnifi/master

More Chapter 2 fixes