Increase match counter, fix early rounding error in match number calculation