some misc upgrades