Added Sbits supported, remapped some registers