And encore: more trigger mistakes fixed