locale prep and bug fixes