Match field iteration plus a few bug/typo fixes

Reviewer: @andi-bigswitch