reapplied facet graph changes

Hi Roman,

Here are some small changes to the facets--all the tests work --I am just replacing a few things that were not applied in your merge of  branch #41. 

Thanks,
Alex