Correct factions hooks for multiple versions of factions
Minor fixes
more null check?