updated some metrics behavior
testing and enhancing the metrics
testing..