added surface and cell data and fixed parsing for full input file