move clconvolve
clean up a bit