diff --git a/demoapp/package.json b/demoapp/package.json
index b83d721..440c4c0 100644
--- a/demoapp/package.json
+++ b/demoapp/package.json
@@ -12,7 +12,7 @@
     "s3": "^4.4.0"
   },
   "scripts": {
-    "start": "react-scripts start",
+    "start": "PORT=8000 react-scripts start",
     "build": "react-scripts build",
     "test": "react-scripts test --env=jsdom",
     "eject": "react-scripts eject"
diff --git a/demoapp/src/App.js b/demoapp/src/App.js
index 4b068aa..d4fc6a2 100644
--- a/demoapp/src/App.js
+++ b/demoapp/src/App.js
@@ -5,13 +5,16 @@ import Web3 from 'web3';
 
 //requires some stuff to be installed:
 //  bouncer-proxy -> clevis test full
+//  mkdir ~/dapparatus/demoapp/src/contracts
 //  cp ~/bouncer-proxy/src/contracts/* ~/dapparatus/demoapp/src/contracts/
-//  cp ~/bouncer-proxy/Example/Example.address ~/dapparatus/demoapp/Example/
-//  clevis test publish
+//  mkdir ~/dapparatus/demoapp/Example
+//  cp ~/bouncer-proxy/Example/* ~/dapparatus/demoapp/Example/
+//  in demoapp: clevis test publish
 
 const METATX = {
   endpoint:"http://0.0.0.0:10001/",
-  contract:"0xf5bf6541843D2ba2865e9aeC153F28aaD96F6fbc"
+  contract:"0xf5bf6541843D2ba2865e9aeC153F28aaD96F6fbc",
+  //accountGenerator: "//account.metatx.io",
 }
 
 class App extends Component {
@@ -86,10 +89,10 @@ class App extends Component {
       connectedDisplay.push(
         <Transactions
           key="Transactions"
-          config={{DEBUG:true}}
+          config={{DEBUG:false}}
           metaAccount={this.state.metaAccount}
           metaContract={this.state.metaContract}
-          metatx={this.state.metatx}
+          metatx={METATX}
           account={account}
           gwei={gwei}
           web3={web3}
@@ -115,7 +118,7 @@ class App extends Component {
               {this.state.count}
             </div>
             <Button size="2" onClick={()=>{
-                tx(contracts.Example.addAmount(3),(receipt)=>{
+                tx(contracts.Example.addAmount(3),50000,(receipt)=>{
                   console.log("addAmount RESULT:",receipt)
                 })
               }}>
@@ -130,7 +133,7 @@ class App extends Component {
       <div className="App">
         <Dapparatus
           config={{
-            DEBUG:true,
+            DEBUG:false,
             requiredNetwork:['Unknown','Rinkeby'],
           }}
           metatx={METATX}
diff --git a/package-lock.json b/package-lock.json
index 3e53abb..b7d2e84 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12102,6 +12102,18 @@
             "underscore": "1.8.3",
             "web3-core-helpers": "1.0.0-beta.35",
             "websocket": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2"
+          },
+          "dependencies": {
+            "websocket": {
+              "version": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2",
+              "from": "git://github.com/frozeman/WebSocket-Node.git#browserifyCompatible",
+              "requires": {
+                "debug": "^2.2.0",
+                "nan": "^2.3.3",
+                "typedarray-to-buffer": "^3.1.2",
+                "yaeti": "^0.0.6"
+              }
+            }
           }
         },
         "web3-shh": {
diff --git a/src/address.js b/src/address.js
index 7da701e..8ba2369 100644
--- a/src/address.js
+++ b/src/address.js
@@ -58,7 +58,11 @@ class Address extends Component {
   load() {
     window.web3.eth.getBalance(this.props.address,(err,balance,e)=>{
       if(balance){
-        balance=balance.toNumber()/1000000000000000000
+        if(typeof balance == "string"){
+          balance = parseFloat(balance)/1000000000000000000
+        }else{
+          balance=balance.toNumber()/1000000000000000000
+        }
         this.setState({balance:balance})
       }
     })
diff --git a/src/dapparatus.js b/src/dapparatus.js
index 1805400..46ac996 100644
--- a/src/dapparatus.js
+++ b/src/dapparatus.js
@@ -8,12 +8,18 @@ import Blockies from 'react-blockies'
 import ENS from 'ethereum-ens'
 import Web3 from 'web3';
 import Button from "./button.js"
+const queryString = require('query-string');
 
 let interval
 let defaultConfig = {}
 defaultConfig.DEBUG = false;
 defaultConfig.POLLINTERVAL = 777
 defaultConfig.showBalance = true
+
+//metatx
+defaultConfig.metatxAccountGenerator = "//account.metatx.io"
+
+
 defaultConfig.hideNetworks = [
   "Mainnet"
 ]
@@ -57,24 +63,33 @@ defaultConfig.requiredNetwork = [
   "Mainnet",
   "Unknown"//allow local RPC for testing
 ]
+
 class Dapparatus extends Component {
   constructor(props) {
     super(props);
     let config = defaultConfig
+
     if(props.config) {
       config = deepmerge(config, props.config)
       if(props.config.requiredNetwork){ config.requiredNetwork = props.config.requiredNetwork}
     }
-    const { cookies } = props;
-    let metaAccountCookie = cookie.load('metaAccount')
+    let queryParams = queryString.parse(window.location.search)
+    let metaPrivateKey = cookie.load('metaPrivateKey')
     let metaAccount
     let account = 0
-    if(metaAccountCookie){
+    if(metaPrivateKey){
       let tempweb3 = new Web3()
-      metaAccount = tempweb3.eth.accounts.privateKeyToAccount(metaAccountCookie.privateKey);
+      metaAccount = tempweb3.eth.accounts.privateKeyToAccount(metaPrivateKey);
       account = metaAccount.address
+    }else if(queryParams.privateKey){
+      const expires = new Date()
+      expires.setDate(expires.getDate() + 365)
+      cookie.save('metaPrivateKey', queryParams.privateKey, { path: '/',expires})
+      window.location = window.location.href.split("?")[0];
     }
 
+    console.log("!!!!~~~~~ ",config)
+
     this.state = {
       status:"loading",
       network:0,
@@ -84,7 +99,7 @@ class Dapparatus extends Component {
       avgBlockTime: 15000,
       lastBlockTime: 0,
       metaAccount: metaAccount,
-      metatx: this.props.metatx
+      web3Fellback: false,
     }
   }
   componentDidMount(){
@@ -99,6 +114,7 @@ class Dapparatus extends Component {
     if (typeof window.web3 == 'undefined') {
       console.log("Connecting to infura...")
       window.web3 = new Web3(this.props.fallbackWeb3Provider) //CORS ISSUES!//
+      this.setState({web3Fellback:true})
       //window.web3 = new Web3(new Web3.providers.WebsocketProvider('wss://rinkeby.infura.io/ws'))
     }
 
@@ -113,10 +129,9 @@ class Dapparatus extends Component {
       }
     } else {
       if(this.state.config.DEBUG) console.log("DAPPARATUS - yes web 3",window.web3)
-
       if(typeof window.web3.version.getNetwork != "function"){
         window.window.web3.eth.net.getId((err,network)=>{
-          console.log("NETWORK GETID",err,network)
+          //console.log("NETWORK GETID",err,network)
           this.inspectNetwork(network)
         })
       }else{
@@ -124,8 +139,6 @@ class Dapparatus extends Component {
           this.inspectNetwork(network)
         })
       }
-
-
     }
   }
   inspectNetwork(network){
@@ -134,22 +147,24 @@ class Dapparatus extends Component {
     if(this.state.config.DEBUG) console.log("DAPPARATUS - translated network",network)
     let accounts
     try{
+      if(this.state.config.DEBUG) console.log("DAPPARATUS - getting accounts...")
       window.web3.eth.getAccounts((err,_accounts)=>{
-
-        if(!_accounts||_accounts.length<=0||network=="Unknown"||network=="Private"){
+        //console.log("ACCOUNTS",err,_accounts)
+        if(!_accounts||_accounts.length<=0||this.state.web3Fellback){
           if(this.state.config.DEBUG) console.log("DAPPARATUS - no inject accounts - generate? ")
           if(!this.state.metaAccount||!this.state.metaAccount.address){
             this.setState({status:"noaccount"},()=>{this.props.onUpdate(this.state)})
           }else{
             let currentAccounts = []
-            console.log("generated account",this.state.metaAccount)
+            //console.log("generated account",this.state.metaAccount)
             currentAccounts.push(this.state.metaAccount.address)
-            console.log("currentAccounts",currentAccounts)
+            //console.log("currentAccounts",currentAccounts)
             this.inspectAccounts(currentAccounts,network)
           }
         }else{
           if(this.state.config.DEBUG) console.log("DAPPARATUS - injected account: ",_accounts)
           this.inspectAccounts(_accounts,network)
+          this.setState({metaAccount:false})
         }
       })
     }catch(e){
@@ -181,7 +196,7 @@ class Dapparatus extends Component {
       window.web3.eth.getBalance(""+account,(err,balance,e)=>{
         if(typeof balance == "string"){
           balance = parseFloat(balance)/1000000000000000000
-        }else{
+        }else if(balance){
           balance=balance.toNumber()/1000000000000000000
         }
 
@@ -263,15 +278,24 @@ class Dapparatus extends Component {
       let mmClick = ()=>{
         window.open('https://metamask.io', '_blank');
       }
+      if(this.state.config.metatxAccountGenerator){
+        dapparatus = "Connecting to "+this.state.config.metatxAccountGenerator+"..."
+        window.location = this.state.config.metatxAccountGenerator
+      }else{
+        dapparatus = "Generating Account..."
+        let result = window.web3.eth.accounts.create();
+        //console.log("GENERATE",result)
+        const expires = new Date()
+        expires.setDate(expires.getDate() + 365)
+        cookie.save('metaPrivateKey', result.privateKey, { path: '/',expires})
+        this.setState({metaAccount:result,account:result.address})
+      }
+
+      /*
       dapparatus = (
         <div style={this.state.config.boxStyleBefore}>
           <Button color={"blue"} onClick={()=>{
-              let result = window.web3.eth.accounts.create();
-              console.log("GENERATE",result)
-              const expires = new Date()
-              expires.setDate(expires.getDate() + 365)
-              cookie.save('metaAccount', result, { path: '/',expires})
-              this.setState({metaAccount:result,account:result.address})
+
             }}>
             Generate Account
           </Button>
@@ -281,7 +305,7 @@ class Dapparatus extends Component {
             Install Wallet
           </Button>
         </div>
-      )
+      )*/
     } else if(this.state.status=="locked"){
       dapparatus = (
         <div style={this.state.config.boxStyleBefore}>
@@ -333,7 +357,11 @@ class Dapparatus extends Component {
            }
 
            let displayName = this.state.account.substr(0,this.state.config.accountCutoff)
-           if(this.state.ens) displayName = this.state.ens
+           if(this.props.replaceName){
+             displayName = this.props.replaceName
+           }else if(this.state.ens){
+             displayName = this.state.ens
+           }
 
            dapparatus = (
              <div style={this.state.config.boxStyle}>
diff --git a/src/transactions.js b/src/transactions.js
index 218c202..dda263e 100644
--- a/src/transactions.js
+++ b/src/transactions.js
@@ -18,6 +18,9 @@ defaultConfig.GASLIMITMULTIPLIER = 1.2;
 defaultConfig.EXPECTEDPROGRESSBARVSAVGBLOCKTIME = 2.1;
 defaultConfig.DEFAULTGASLIMIT = 120000;
 
+
+const METATXPOLL = 1777
+
 class Transactions extends Component {
   constructor(props) {
     super(props);
@@ -31,6 +34,48 @@ class Transactions extends Component {
       config: config,
       callbacks: {}
     }
+    if(props.metatx){
+      this.metaTxPoll()
+      setInterval(this.metaTxPoll.bind(this),METATXPOLL)
+    }
+  }
+  metaTxPoll(){
+    let metatxUrl = this.props.metatx.endpoint+'txs/'+this.props.account
+    axios.get(metatxUrl, {
+      headers: {
+          'Content-Type': 'application/json',
+      }
+    }).then((response)=>{
+      if(response&&response.data){
+        let currentTransactions = this.state.transactions
+        let callbacks = this.state.callbacks
+        let changed = false
+        for(let d in response.data){
+          let thisTransaction =  response.data[d]
+          let found = false
+          for(let t in currentTransactions){
+            if(currentTransactions[t].hash == thisTransaction.hash){
+              found = true
+            }
+          }
+          if(!found){
+            console.log("INCOMING META TX:",response.data[d])
+            changed=true
+            if(this.state.config.DEBUG) console.log("Adding tx to list...")
+            currentTransactions.push(thisTransaction)
+            callbacks[transactionHash] = ()=>{
+              console.log("META TX FINISHED",transactionHash)
+            }
+          }
+        }
+        if(changed){
+          this.setState({transactions:currentTransactions,callbacks:callbacks})
+        }
+      }
+    })
+    .catch((error)=>{
+      console.log(error);
+    });
   }
   componentDidMount(){
     interval = setInterval(this.checkTxs.bind(this),this.state.config.CHECKONTXS)
@@ -39,41 +84,44 @@ class Transactions extends Component {
       metatx: async (tx,maxGasLimit,txData,cb)=>{
         if(this.state.config.DEBUG) console.log("YOU WANT TO SEND A META TX ",tx,this.props.gwei)
         let callback = cb
-        let minBlock = 0
         let value = 0
-        this.sendMetaTx(this.props.metatx.contract,this.props.metaAccount.address,tx._parent._address,value,tx.encodeABI(),minBlock)
+        this.sendMetaTx(this.props.metatx.contract,this.props.metaAccount.address,tx._parent._address,value,tx.encodeABI())
       },
-      tx: async (tx,maxGasLimit,txData,cb)=>{
+      tx: async (tx,maxGasLimit,txData,value,cb)=>{
         if(this.state.config.DEBUG) console.log("YOU WANT TO SEND TX ",tx,this.props.gwei)
         let callback = cb
 
+        console.log("==MM meta:",this.props.metaAccount)
+
         if(this.props.metaAccount){
           console.log("================&&&& metaAccount, send as metatx to relayer "+this.props.metatx.endpoint+" to contract :",this.props.metatx.contract)
-          let minBlock = 0
-          let value = 0
-          this.sendMetaTx(this.props.metatx.contract,this.props.metaAccount.address,tx._parent._address,value,tx.encodeABI(),minBlock)
+          let _value = 0
+          this.sendMetaTx(this.props.metatx.contract,this.props.metaAccount.address,tx._parent._address,_value,tx.encodeABI())
         }else{
           let gasLimit
-          try{
-            gasLimit = Math.round((await tx.estimateGas()) * this.state.config.GASLIMITMULTIPLIER)
-          }catch(e){
-            if(typeof maxGasLimit != "function"){
-              gasLimit = maxGasLimit
-            }else{
+          if(typeof maxGasLimit != "function"){
+            gasLimit = maxGasLimit
+          }else{
+            try{
+              gasLimit = Math.round((await tx.estimateGas()) * this.state.config.GASLIMITMULTIPLIER)
+            }catch(e){
               gasLimit = this.state.DEFAULTGASLIMIT
             }
           }
-
           if(typeof maxGasLimit == "function"){
             callback = maxGasLimit
           }
 
+          if(!value) value=0
           let paramsObject = {
             from: this.props.account,
-            gas:gasLimit,
-            gasPrice:Math.round(this.props.gwei * 1000000000)
+            value: value,
+            gas: gasLimit,
+            gasPrice: Math.round(this.props.gwei * 1000000000)
           }
 
+          console.log("TX",paramsObject)
+
           if(typeof txData == "function"){
             callback = txData
           }else if(txData){
@@ -169,10 +217,9 @@ class Transactions extends Component {
   componentWillUnmount(){
     clearInterval(interval)
   }
-  async sendMetaTx(proxyAddress,fromAddress,toAddress,value,txData,minBlock){
-    if(!minBlock) minBlock=0
+  async sendMetaTx(proxyAddress,fromAddress,toAddress,value,txData){
     let {metaContract,account,web3} = this.props
-    const nonce = await metaContract.nonce(fromAddress,minBlock).call()
+    const nonce = await metaContract.nonce(fromAddress).call()
     console.log("Current nonce for "+fromAddress+" is ",nonce)
     let rewardAddress = "0x0000000000000000000000000000000000000000"
     let rewardAmount = 0
@@ -189,6 +236,8 @@ class Transactions extends Component {
     }*/
 
     console.log("Reward: "+rewardAmount+" tokens at address "+rewardAddress)
+
+
     const parts = [
       proxyAddress,
       fromAddress,
@@ -197,7 +246,6 @@ class Transactions extends Component {
       txData,
       rewardAddress,
       web3.utils.toTwosComplement(rewardAmount),
-      web3.utils.toTwosComplement(minBlock),
       web3.utils.toTwosComplement(nonce),
     ]
     console.log("PARTS",parts)