tweaks to entropies

A few tweaks to the entropy formulas.