added table of non-dis items, plus some cleanup