updated geomconv
incorporated upstream updates