Log-likelihood calc now iterates over types rather than tokens. Also properly replaces OOV with special token.