closes #93 and #94. We got unbored.