fixing localization bugs