Added iteration editing.  Improved error displays