Geometry object + example + fixes