Facet tree extended with plugin system; some other work