fill in cells more smartly