Localization improvements, needs still some testing