fixup
field fixes and tests
unsafe string fix
unsafe string fix test