Shuffle and loop now working