few upgrades and tweaks to text