More script refactoring
Adjusted conditions under which the intro popup is shown
Casing changes