a few more warping tweaks