Sunday night tweakages.

Closes #132.