some corrections and styling