more progress on i18n