Moving last part of transformation with control points into R - now matches affine result exactly; other affine fixes
Transform functions now work in 2D