fixed some issues with switching factions