Fixed bug in self/instance
Rewrote matchmaking logic