More functional upgrades

Added more flesh to things regarding combat units.