Trigger system improvements 

@AmbientOSX @BrettASwift 
What is this used for? I see scenarioName is also declared down in the callback. This value seems to be overwritten and never used as assigned here.