Added in a shuffle for extra random selection
Finally fixed "UnicodeWarning: Unicode equal comparison failed to convert both arguments to Unicode - interpreting them as being unequal"