hyphenation and pickled assignment extras

... are the main changes, plus a bit of tidying up of comments, and some
other very small corrections.