Changed how device format is selected in restart_playback, and other small changes...