some bugfixes and innovations to tournament