fixed match() to prefer prefix-matches to strstr-matches in the match list, extended...