Add more descriptions for facets and providers.  Some cleanup.