First pass at text tweaks