fixed all the drama with uninitialized geometries in some cases.