server-benchmark: add various improvements