Added inventory weight and better item quantity handling