misc upgrades and use changes