More upgrades and a little balancing