add fit matrix calculation
some straighten, warp better