Fixing storage graph

(Not done yet!)