Tidy up and document for release 1.5.18