additional geometries and bug fixes