restructured convolve & match routines