Fixed bigrams + minor changes