update pvp (+4 squashed commit)

Squashed commit:

[af99182] update pvp

[e37fa18] update pvp

[e20bd71] update pvp

[fbca283] update pvp sim