locale update and script improvements