fixes, upgrades

yes