Ensure headers are correctly labeled after adding/deleting cells.  Fix AND.