bigram update + minor fix