Add line returns to error messages
Change benchmark to include all block types
Move stats gathering during benchmarks to before all blocks are removed