Throughput test and bugs fixed