Serialization, m***********
Cleaned up + integrity checks