More one-off stuff and text touch-ups