Thanks! Yeah both are great points that I would like to improve. The upgrades and tradeoffs could be more interesting and its not too great with performance in the end, but I should be able to improve this.
