tidying, hoffart compatibility, debugging entity_match