minor fixes e more on i18n