more issue #54 fixes and testing