Added support to invalid indices in Match.
seems all done.
Renamed.