more work on i18n