items again

the items functions are not what search, so i removed that. a few
generic changes as well