change finished to finished at, update metrics