Can play a match during a tournament, minor improvements