refactor off/reemit. closes #56