lots of changes to support investigation of how well disambiguation code functions
many changes to work with new clavin-server api (which now has primary country field)