More fixing of the Data Container writers and readers. Still NOT done yet.