Tooltip: Integrate Weapon Damage and show Armor only if it exists
plus some other minor fixes