Various bug and consistency fixes for CifData
and StructureData
#2374
+189
−91
CifData
and StructureData
#2374