more maps; fixed serialization