* minor updates, mostly on serialization