adding storage to the stock and fixes