Seperate PvP & PvM fixes

Printable View