adding basic locale support and fixing supported locales