Trigger system improvements 

@AmbientOSX @BrettASwift 
@BrettASwift Was it intentional to move this out of the loop?  Seems odd...