v0.1.11-rc.3; misc fixes + temp defer revert until refactor (#51)