some work on making l10n work better