WTB PVP fixes

Read this post, itll explain why a lot of the community is upset