improved unmix_xcorrs