missed a few spots where the cell index was wrong