improved shuffle, fixed play button