Text tweaks
Merged