Made some modifications to the internal GridCell structure.