changed map parsing and cell bahaviour