Parsing CELL, bugfixes