Fixed most 'storage' calls, struggline with one