applied nibbles fixes, slightly modified