moving stuff around
misc cleanups to downsampling