Feature/output tweaks

Addresses issue #93.  See comments therein.