Small fix for problem with CellName.
Highly modified code, don't what really! ;-)