Corrected many bugs in tournament implementation