Patched up the tutorial world. This is a crazy amount of work.