Matching engine improvements

Fixed issues with matching from rounds 0 to 2