Random fixes
merged remote TempFlockingBranch into local optimiseGetCharacters