Upgrades and Healing

In 1.5 upgrades are quite expensive. And they improve stats across the board. They signify a major retrofit, like a unit receiving all new tanks and rifles radios and whatnot.

There are two ways to improve this (other than making upgrades free, like in 1.0 but let's not go there).

1. Cost should be relative to % health. A unit that's almost dead should upgrade for much less than a healthy unit. Obviously, it's going to need fewer tanks and rifles and radios.

or

2. An upgrade should heal the unit. It just got new equipment, and it cost a lot, so why not some new troops to man the new equipment? Else, why require manpower to upgrade? Manpower implies, well, more manpower!