Text fixes and improvements