Added sensitivity to grammar for figuring out what word is what