waterfall can select swps now, fix xstep in chunker