fixed serialized/JSON-ification issues