Merge Maestro: 1.1.2 Hotfix

Hotfix to fix a couple minor bugs but most importantly a bug that was sometimes stopping the tutorial from working properly