Tweaks.
Improved and corrected cell handling.