increased pun limit, removed dan as trigger