add facets & minor changes