more storage fixes
storage wip