Various simple fixes trying to improve results.
Even more fixes!
Man, this sucks. Bigrams were so much easier *and* better...