Updating graph comparison and entropy metrics. Quasi-final versions.