+1, please fix the tournament 🙂
Re: #2 I think the best solution would be, if technically feasible for developers, to set the default setting for tournament games that any player who times out (and is thus replaced by AI) automatically finishes last (and the player who times out next - second from last, etc.). For non-tournament games the current settings could remain (but this would require "tournament" flag in the code to distinguish tournament games).