upgrades and minor changes