Trigger system improvements 

@AmbientOSX @BrettASwift 
No, I actually moved it into the loop. It's probably not good that it changed back on its own.