Text fixes and some formatting