Added limited random factions and fixed lightshifter