More fixes

Get the row and column right, some code cleanup