upgrades, imports and tweaks