Bugfixes; add default argument for shuffle