- re-wrap resulting long lines
missing bits (well, all the bits I could think of) and updated the rest.