Issue #122 fixed, pending verification; issue #121 - fixing in progress