Minor tweaks after additional testing of drain script.

 * issue #51