Changes for the begin of the tournament, some bugfixes for updating