fixed mash/serialization bugs again maybe