Improved row/col numbering.