Final(ish) text tweaks