assorted upgrades and tweaks