Upgrades to my ever-evolving setup