rework cross-language matching logic. Better indicate which language was matched. Fixes #6