improve some localization