Audio now merged straight from original file. Original track order preserved by calling the converted video track first, then the audio tracks (in order) from the original file, then the subtitle files (which are in order).