added localization and minor fixes