work on serialization
all specs passing
little fix