revised metrics.py greater functionality -KL