Gree/Deca,

In your Phase 2 consolidation of the Units with Bonuses, I would suggest that you don't modify any items that have a bonus with a reduction effect (aka Health regen/ building upgrade...