fix (unify) serialization for Matrix[S] versus DataSource.Variable[S]
test serialization
fix serialization (really)