minor fixes on the language model
Merge remote-tracking branch 'origin/master'