Updated the formulas

I think the formulas are correct now. May need to revisit the Attribute checks to make sure that the Mods are applied in the correct place.