i18n + various fix