Wrapper clases for point2d and line2d plus minor changes