Crucial PVP tweaks and bugfixes