Upgrades and bugfixes