Minor changes to doc, tidy up