Few more text tweaks