many localization related changes