more work on I18N