localization improvements