Minor fixes+moar wraparound changes

Even prepared to reverse the encoders.