Various minor fixes and new facets.