small fixes + added support for bigrams (n-grams in close future)