fix to allow maps and lists
more unit testing for serialization