ticket:47 Text fixes