Fixed ngrams and bigrams to give them additional options and make ngrams fully generalizable.