Various upgrades following testing