More work on the facet system