- ois now deliveres native_key and utf32 key
- code cleanups