Further small changes ready for writing e-mail.