upgrades and fixes