Right now you offer two options to retrieve items: Punch and Shift-Click. They have the same outcome which is somehow unnecessary.

I'd propose to have regular PUNCH extract only ONE ITEM while SHIFT-CLICK extracts X or one stack, as it is right now.