Add non zero mappings
Fix multibyte error
Fix skip bytes
Fix infinite loop