minor improvements
toward addressing issue #16