fix #30 and generally ensure map is linked to where needed and facet parameters are passed