various upgrades