More wavelet stuff