Localization and minor changes