some item fixes (see comments)