fix dictitems, codify strings, move imports