Upgrades and other things to make my life easier for stream~