Bug fixes
Updated formulae and Coffeequate.
Merge.