Vendor cap + fixes

Added stackable item support