iterkeys removed, small code fixes