add metrics, fix resources