Post N9. Text fixes 2