bug fixes and update locales