fixed up iteritems, and some string substitutions issues

problems do remain.