Added a few formulas and fixed some of 'em broken ones