Several functional upgrades