more changes on playback and track