better failure recording; in-order matching