Fixes for colspans

We've encountered a bug because it wasn't correctly taking into
account the additional cells.

Work in progress
---