added localeId()
minor fixes