Commit neglected material. [#87]
Improve messages. [#87]