locales and some changes