Magic Damage formula edits

Doing math with these results while at work because this is really bugging me. Instead of multiplying the Wand Bonus with the Charge Multiplier, I think it'd be easier just to list the Wand Bonus at varying charges for each bolt. Obviously, the "each bolt" part only REALLY matters with Firebolt. As such I propose revising the formula into this:

[Base Damage + Wand Bonus + (Spell Constant * Magic Attack) + (Damage Enchants * Damage Constant)]
* [1 + (Bolt Mastery Bonus + Elemental Mastery Bonus + Magic Weapon Mastery Bonus + Staff Elemental Level Bonus + Hebona Set Bonus + Rosemary Glove Bonus)]
* Charge Multiplier * Full Charge Multiplier * Thunder Multiplier * Distance Multiplier

And then changing the description of Wand Bonus into this:

• Wand Bonus is a constant for bolt spells while using a wand of the same element.
  • The value for Spirit Weapon wands depends on the Social level of the spirit. Actual values are unknown, but generally equal or higher than non-spirit wands.
  • For non-spirit wands, the values are as follows:
    • Icebolt with any non-spirit Ice Wand at 1 to 5 charges: 10.0
    • Firebolt with any non-spirit Fire Wand varies depending on number of charges:
      • 1 charge: 7.0
      • 2 charges: 12.0
      • 3 charges: 17.0
      • 4 charges: 22.0
      • 5 charges: 27.0
    • Lightning Bolt with any non-spirit Lightning Wand at 1 to 5 charges: 7.0
  • All other cases, including with Bare Hands or Staff: 0

I need to do further testing with bare hands at different numbers of charges to make sure about this formula though.