check for no-OTHER state too
don't redeclare i
clean up dnd file.  keep formula cases.