fixes, upgrades