more locale changes and bug fixes