improve metrics and health checks