Getting rid of the bugs that caused the system to crash after 10 matches