Add QPS limits and tweak output