Final installment of text tweaks

[#42650471]