All sorts of fixes. Iterator works now.