localization improvments