Lots of changes to make new PVP system work even better.