Proper formatting
PVP/PVE fixes and other minor changes