more warp affine

minor changes to clean up warp affine