Further work and fixes on playback cleanup.