Cleaner handling of match reset; fix unable to /ready on second match