More upgrades and tweaks.