more partial work on i18n