Improving and adding corrections to Graph metrics. Untested, not
working!