fixes/upgrades