Add new formulas; small cleanup