bunch of upgrades