Some random adjustments to the shuffle playlist for debugging.
Some restructuring of the code.