Wands will not absorb a lesser upgrade

MAGIC-34 #done
Better messaging on upgrades

MAGIC-35 #done