fixed parametrisation, ShuffleList is a component, other fixes
fixed parametrisation, ShuffleList is a component, other fixes