Fixed bug with hex-str saving. Didn't save map.

made more tests that pass.