FIXED: minor issues, including use of locale