Trigger system improvements 

@AmbientOSX @BrettASwift 
Same as above.