some improvements to the point warping