Polish pass 8/21

@kadst43 Fixes a number of small punchlist items from Juan's email.
Could be - as I said, I'm not sure what the lines are.  If your intent is for them to fire in 5 seconds no matter what, then this is a good way to do it (and if it doesn't work, we should make it work - I'm not sure whether I re-check whether the trigger has been deleted when the pause action fires).