Fixed some major bugs with PVP