fixes #20 and #31; identification of items