Fix a couple of issues, add a throughput test.