A few updates to the state.event runner