Added more metrics and fixed some of them.