fixed some more problems  with console messages
Upgrades must be taken into account for healthbars too