add resetEncoder(); minor fixes

should be forward-ported to the revert I'm about to do