improvements for locale.