Fixed some formatting bugs and undermeasuring throughput