re-introduce incremental, 16 bit modulo subtleties