Trigger system improvements 

@AmbientOSX @BrettASwift 
I did not. I'm not sure. I don't think it should be removed.