some tweaks to the warping systems