diff --git a/README.md b/README.md
index fd9b557..a08a688 100644
--- a/README.md
+++ b/README.md
@@ -29,32 +29,34 @@ npm i svelte-web3
 <script src="https://cdn.jsdelivr.net/npm/web3@latest/dist/web3.min.js"></script>
 ```
 
-This step is necessary for now because the Web3.js doesn't play well with bundlers (webpack,
-vite, snowpack, etc), thus we cannot simply add a dependency in package.json.
+This step is necessary for now because the Web3.js library doesn't
+play well with bundlers (webpack, vite, snowpack, etc), thus we cannot
+simply add a dependency in package.json.
 
 
 ## Basic usage (default stores connected to one chain)
 
-## Derived stores
+### Derived stores
 
-This library is creating automatically a set of readable Svelte stores
-that are automatically updated when a new connection happens, or when
-the chain or the selected account change. You can import them directly
-in any svelte or JavaScript files :
+This library creates a set of readable Svelte stores that are
+automatically updated when a new connection happens, or when the chain
+or the selected account change. You can import them directly in any
+svelte or JavaScript files :
 
 ```js
 import { connected, web3, selectedAccount, chainId, chainData } from 'svelte-web3'
 ```
 
  * connected: store value is true a connection has been set up.
- * web3: store value is an Web3.js instance if connected.
- * selectedAccount: store value is the current selected account (if connected).
- * chainId: store value is the current chainId if connected.
- * chainData: store value is the current blokchain CAIP-2 data (if connected), see below.
+ * web3: store value is a Web3.js instance when connected.
+ * selectedAccount: store value is the current selected account (when connected).
+ * chainId: store value is the current chainId when connected.
+ * chainData: store value is the current blokchain CAIP-2 data (when connected), see below.
 
-For these stores to be useful in your svelte application, you first need to connect to the blockchain.
+For these stores to be useful in your svelte application, you thus
+first need to connect to the EVM blockchain.
 
-The main connection helper `defaultEvmStores` can be use to initiate a connection.
+The main connection helper `defaultEvmStores` can be used to initiate a connection.
 
 ```js
 import { defaultEvmStores } from 'svelte-web3'
@@ -90,7 +92,7 @@ former naming still works but will be removed in later versions of
 ### Connection with other providers (ws, http, Web3Modal, Walletconnect, etc)
 
 To enable connection using an url string or a valid provider object
-(as returned by web3Modal or WalletConnect for example):
+(for example as returned by web3Modal or WalletConnect):
 
 ```js
 defaultEvmStores.setProvider(<ws/https or http provider url or provider Object>)
@@ -99,11 +101,12 @@ defaultEvmStores.setProvider(<ws/https or http provider url or provider Object>)
 Please check `examples/svelte-app-template-web3/src/Web3Modal.svelte` in github.
 
 
-### Using the connection Web3 API 
+### Using the Web3 API 
 
 After a connection has been established, you may import the default
-`web3` store anywhere in your application to use Web3.js API. Use the
-`$` prefix svelte notation to access its value and call Web3.js functions.
+`web3` store anywhere in your application to use the Web3.js API. Use
+the `$` prefix svelte notation to access its instance and call Web3.js
+functions.
 
 ```js
   import { web3, selectedAccount } from 'svelte-web3'
@@ -116,15 +119,16 @@ After a connection has been established, you may import the default
 ```
 
 The whole Web3.js API is usable in the `<script>` section of your
-svelte files if you always use notation `$web3` (beware, `web3` is the
-default notation in web3.js library documentation but in our context,
-it's the Svelte store itself, not it's value, the instantiated
-library).
+svelte files using the notation `$web3` (beware, in the Web3.js
+library documentaion, instances are always noted as `web3`, without
+`$`, but in the context of `svelte-web3`, `web3` is the Svelte store
+itself, not it's value).
 
 
 ### Forcing a disconnect (and the remove all listeners)
 
-Simply call the function `disconnect` directly on the store. For example with the default store:
+Simply call the function `disconnect` directly on the store. For
+example with the default store:
 
 ```js
 defaultEvmStores.disconnect()
diff --git a/examples/svelte-app-template-web3/src/App.svelte b/examples/svelte-app-template-web3/src/App.svelte
index b03e40a..0a84b8a 100644
--- a/examples/svelte-app-template-web3/src/App.svelte
+++ b/examples/svelte-app-template-web3/src/App.svelte
@@ -3,6 +3,7 @@
   import MultiChain from './MultiChain.svelte'
   import Web3Modal from './Web3Modal.svelte'
 
+  let name
   let example = MonoChain
 
   $: metamaskConnected = window.ethereum ? window.ethereum.isConnected() : false
diff --git a/examples/svelte-app-template-web3/src/MonoChain.svelte b/examples/svelte-app-template-web3/src/MonoChain.svelte
index 1514c29..aedd9b3 100644
--- a/examples/svelte-app-template-web3/src/MonoChain.svelte
+++ b/examples/svelte-app-template-web3/src/MonoChain.svelte
@@ -1,17 +1,17 @@
 <script>
-  import { allChainsData, makeChainStore, defaultChainStore, web3, selectedAccount, connected, chainId, chainData } from 'svelte-web3'
+  import { allChainsData, makeEvmStores, defaultEvmStores, web3, selectedAccount, connected, chainId, chainData } from 'svelte-web3'
 
   import { Balance } from 'svelte-web3/components'
 
   let tipAddress = '0x834356a88C66897FA0A05a61964a91A607956ee3'
 
   let sokol, sokol_connected, sokol_web3
-  ({ connected: sokol_connected, web3: sokol_web3, ...sokol } = makeChainStore('sokol'))
+  ({ connected: sokol_connected, web3: sokol_web3, ...sokol } = makeEvmStores('sokol'))
 
   sokol.setProvider('https://sokol.poa.network')
 
-  const enable = () => defaultChainStore.setProvider('https://sokol.poa.network')
-  const enableBrowser = () => defaultChainStore.setBrowserProvider()
+  const enable = () => defaultEvmStores.setProvider('https://sokol.poa.network')
+  const enableBrowser = () => defaultEvmStores.setBrowserProvider()
 
   $: checkAccount = $selectedAccount || '0x0000000000000000000000000000000000000000'
 
diff --git a/examples/svelte-app-template-web3/src/RPC.svelte b/examples/svelte-app-template-web3/src/RPC.svelte
index d9fa227..5449c79 100644
--- a/examples/svelte-app-template-web3/src/RPC.svelte
+++ b/examples/svelte-app-template-web3/src/RPC.svelte
@@ -1,11 +1,11 @@
 <script>
-  import { makeChainStore } from 'svelte-web3'
+  import { makeEvmStores } from 'svelte-web3'
 
   export let name
   export let provider
 
   let ethStore, web3, connected, selectedAccount, chainId, chainData
-  ({ web3, connected, selectedAccount, chainId, chainData, ...ethStore } = makeChainStore(name))
+  ({ web3, connected, selectedAccount, chainId, chainData, ...ethStore } = makeEvmStores(name))
 
   ethStore.setProvider(provider)
 
diff --git a/examples/svelte-app-template-web3/src/Web3Modal.svelte b/examples/svelte-app-template-web3/src/Web3Modal.svelte
index 65efad7..d109b2a 100644
--- a/examples/svelte-app-template-web3/src/Web3Modal.svelte
+++ b/examples/svelte-app-template-web3/src/Web3Modal.svelte
@@ -1,10 +1,11 @@
 <script>
-  import { defaultChainStore, web3, selectedAccount, connected, chainId, chainData } from 'svelte-web3'
+  import { defaultEvmStores, web3, selectedAccount, connected, chainId, chainData } from 'svelte-web3'
   import { Balance } from 'svelte-web3/components'
 
   const Web3Modal = window.Web3Modal.default
   const WalletConnectProvider = window.WalletConnectProvider.default
 
+  const disable = () => defaultEvmStores.disconnect()
   const enable = async () => {
     let web3Modal = new Web3Modal({
       cacheProvider: false,
@@ -19,7 +20,7 @@
       disableInjectedProvider: false,
     })
     const provider = await web3Modal.connect()
-    defaultChainStore.setProvider(provider)
+    defaultEvmStores.setProvider(provider)
   }
 
   $: checkAccount = $selectedAccount || '0x0000000000000000000000000000000000000000'
@@ -36,6 +37,13 @@
 </div>
 {/if}
 
+{#if $web3.version}
+<div class="buttons">
+  <button class="button is-link is-light" on:click="{disable}">disconnect</button>
+</div>
+{/if}
+
+
 {#if $connected}
 <p>
   Connected chain: chainId = {$chainId}
diff --git a/package.json b/package.json
index 685e1df..df40956 100644
--- a/package.json
+++ b/package.json
@@ -10,14 +10,14 @@
   },
   "main": "dist/index.js",
   "module": "dist/index.mjs",
-  "svelte": "src/web3-store.js",
+  "svelte": "src/stores.js",
   "types": "dist/svelte-web3.d.ts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
       "main": "./dist/index.js",
       "module": "./dist/index.mjs",
-      "svelte": "./src/web3-store.js",
+      "svelte": "./src/stores.js",
       "types": "./dist/svelte-web3.d.ts"
     },
     "./components": {
diff --git a/rollup.config.js b/rollup.config.js
index cce7798..eeb580b 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -2,7 +2,7 @@ import dts from "rollup-plugin-dts";
 
 export default [
   {
-    input: "./src/web3-store.js",
+    input: "./src/stores.js",
     output: [
       { file: "dist/index.mjs", format: "es" },
       { file: "dist/index.js", format: "umd", name: "web3store" },
diff --git a/src/web3-store.js b/src/stores.js
similarity index 56%
rename from src/web3-store.js
rename to src/stores.js
index e5e0d31..686f1bd 100644
--- a/src/web3-store.js
+++ b/src/stores.js
@@ -1,8 +1,9 @@
 
-import chains from './chains.js'
 import { proxied } from 'svelte-proxied-store'
 import { derived } from 'svelte/store'
 
+import chains from './chains.js'
+
 const getGlobalObject = () => {
   if (typeof globalThis !== 'undefined') { return globalThis }
   if (typeof self !== 'undefined') { return self }
@@ -36,68 +37,66 @@ export const createStore = () => {
 
   const init = () => {
     loadWeb3()
-    if (!Web3.version) throw new Error('Cannot find Web3')
+    if (!Web3.version) throw new Error('[svelte-web3] Cannot find Web3')
     if (getWindowEthereum()) getWindowEthereum().autoRefreshOnNetworkChange = false
     assign({
       connected: false,
+      evmProviderType: '',
       accounts: []
     })
   }
 
-  const setProvider = async (provider, callback) => {
+  const setProvider = async (evmProvider, callback) => {
     init()
-    const instance = new Web3(provider)
+    const instance = new Web3(evmProvider)
     const chainId = await instance.eth.getChainId()
     // no account with ganache
-    const accounts = /127/.test(provider) ? [] : await instance.eth.getAccounts()
+    const accounts = /127/.test(evmProvider) ? [] : await instance.eth.getAccounts()
     if (callback) {
-      instance._provider.removeListener('accountsChanged', () => setProvider(provider, true))
-      instance._provider.removeListener('chainChanged', () =>  setProvider(provider, true))
+      instance._provider.removeListener('accountsChanged', () => setProvider(evmProvider, true))
+      instance._provider.removeListener('chainChanged', () =>  setProvider(evmProvider, true))
     } else {
       if (instance._provider && instance._provider.on) {
-        instance._provider.on('accountsChanged', () => setProvider(provider, true))
-        instance._provider.on('chainChanged', () => setProvider(provider, true))
+        instance._provider.on('accountsChanged', () => setProvider(evmProvider, true))
+        instance._provider.on('chainChanged', () => setProvider(evmProvider, true))
       }
     }
     assign({
-      provider,
-      providerType: 'String',
+      instance,
+      evmProvider: instance._provider,
+      evmProviderType: typeof evmProvider === 'string' ? 'RPC' : 'Web3',
       connected: true,
       chainId,
-      accounts,
-      instance
+      accounts
     })
     emit()
   }
 
   const setBrowserProvider = async () => {
     init()
-    if (!getWindowEthereum()) throw new Error('Please authorize browser extension (Metamask or similar)')
+    if (!getWindowEthereum()) throw new Error('[svelte-web3] Please authorize browser extension (Metamask or similar)')
     const res = await getWindowEthereum().request({ method: 'eth_requestAccounts' })
     getWindowEthereum().on('accountsChanged', setBrowserProvider)
     getWindowEthereum().on('chainChanged', setBrowserProvider)
     const instance = new Web3(getWindowEthereum())
     const chainId = await instance.eth.getChainId()
     assign({
-      provider: getWindowEthereum(),
-      providerType: 'Browser',
+      instance,
+      evmProvider: getWindowEthereum(),
+      evmProviderType: 'Browser',
       connected: true,
       chainId,
-      accounts: res,
-      instance
+      accounts: res
     })
     emit()
   }
 
-  const disconnect = async (provider) => {
-    if(provider && provider.disconnect) {
-      await provider.disconnect()
+  const disconnect = async (evmProvider) => {
+    if(evmProvider && evmProvider.disconnect) {
+      await evmProvider.disconnect()
     }
     deleteAll()
-    assign({
-      connected: false,
-      accounts: []
-    })
+    init()
     emit()
   }
 
@@ -124,48 +123,62 @@ const getData = id => {
   return noData
 }
 
+const subStoreNames = [ 'connected', 'chainId', 'evmProviderType', 'web3', 'selectedAccount', 'chainData', 'walletType' ]
+
 export const makeEvmStores = name => {
 
-  const ethStore = allStores[name] = createStore()
+  const evmStore = allStores[name] = createStore()
+
+  allStores[name].connected = derived(evmStore, $evmStore => $evmStore.connected)
+  allStores[name].chainId = derived(evmStore, $evmStore => $evmStore.chainId)
+  allStores[name].evmProviderType = derived(evmStore, $evmStore => $evmStore.evmProviderType)
 
-  allStores[name].connected = derived(ethStore, $ethStore => $ethStore.connected)
-  allStores[name].chainId = derived(ethStore, $ethStore => $ethStore.chainId)
-  allStores[name].providerType = derived(ethStore, $ethStore => $ethStore.providerType)
   allStores[name].selectedAccount = derived(
-    ethStore,
-    $ethStore => {
-      if ($ethStore.connected) return $ethStore.accounts.length ? $ethStore.accounts[0] : null
+    evmStore,
+    $evmStore => {
+      if ($evmStore.connected) return $evmStore.accounts.length ? $evmStore.accounts[0] : null
       return null
     }
   )
-
-  allStores[name].walletType = derived(ethStore, $ethStore => {
-    if (!$ethStore.provider) return null
-    if (typeof $ethStore.provider === 'string') return $ethStore.provider
-    if ($ethStore.provider.isMetaMask) return 'MetaMask (or compatible)'
-    if ($ethStore.provider.isNiftyWallet) return 'Nifty'
-    if ($ethStore.provider.isTrust) return 'Trust'
-    return 'Unknown'
-  })
-
   allStores[name].web3 = derived(
-    ethStore,
-    $ethStore => {
-      if (!$ethStore.instance) return { utils: Web3.utils, version: Web3.version }
-      return $ethStore.instance
+    evmStore,
+    $evmStore => {
+      if (!$evmStore.instance) return { utils: Web3.utils, version: Web3.version }
+      return $evmStore.instance
     }
   )
 
   allStores[name].chainData = derived(
-    ethStore,
-    $ethStore => $ethStore.chainId ? getData($ethStore.chainId) : {}
+    evmStore,
+    $evmStore => $evmStore.chainId ? getData($evmStore.chainId) : {}
   )
 
-  return allStores[name]
+  allStores[name].walletType = derived(evmStore, $evmStore => {
+    if (!$evmStore.provider) return null
+    if (typeof $evmStore.provider === 'string') return $evmStore.provider
+    if ($evmStore.provider.isMetaMask) return 'MetaMask (or compatible)'
+    if ($evmStore.provider.isNiftyWallet) return 'Nifty'
+    if ($evmStore.provider.isTrust) return 'Trust'
+    return 'Unknown'
+  })
+
+  return new Proxy(allStores[name], {
+    get: function (internal, property) {
+      if (/^\$/.test(property)) {
+        // TODO forbid deconstruction !
+        property = property.slice(1)
+        if (subStoreNames.includes(property)) return allStores[name].get(property)
+        throw new Error(`[svelte-web3] no store named ${property}`)
+      }
+      if (['subscribe', 'get', 'setBrowserProvider', 'setProvider', 'close', 'disconnect', ...subStoreNames].includes(property))
+        return Reflect.get(internal, property)
+      throw new Error(`[svelte-web3] no store named ${property}`)
+    }
+  })
 }
 
 export const getChainStore = name => {
-  if (!allStores[name]) throw new Error(`chain store ${name} does not exist`)
+  if (!allStores[name]) throw new Error(`[svelte-web3] chain store ${name} does not exist`)
   return allStores[name]
 }
 
@@ -187,12 +200,14 @@ export const defaultEvmStores = makeEvmStores('default')
 
 export const connected = allStores.default.connected
 export const chainId = allStores.default.chainId
-export const providerType = allStores.default.providerType
+export const evmProviderType = allStores.default.evmProviderType
 export const selectedAccount = allStores.default.selectedAccount
-export const walletType = allStores.default.walletType
 export const web3 = allStores.default.web3
 export const chainData = allStores.default.chainData
 
+// TODO spin off dectector
+export const walletType = allStores.default.walletType
+
 // legacy naming
 
 export const defaultChainStore = defaultEvmStores