A bit more text tweaks