Updates to improve control during playback