Add localization capabilities, improve messaging