spec: improve setup
storage: some improvements