fix picking up alternate invoice_latexnotes_* files, and expand country codes on...