Feature/more language fixes