More Chapter 2 fixes

mostly positioning and such