Further improvements and cosmetic upgrades