fixed issues with queue and playback because singleton