some i18n improvements