Thank you!!!
I fully agree with your point about the upgrades, I think active abilities would have greatly improved the upgrade experience.
