Some minor updates to match.py