Change stuff to try to get 2grams working
fixed a bug