Some bugs in verification and Match are fixed.