minor updates towards full playback