geometry2d, small changes