deal with languages better

@smn cool. I'll create a new PR for this