i18n and fixes