fixes & upgrades