Various stuff in prep for pvp vs pve; WIP