fixes&upgrades