localization-related fixes and additions