Issue #52

Miscellaneous improvements and bug fixes.
PR feedback response