untested improvements to pvp cooldown
Fuck it. Merge branch 'cooldown'