diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..93b3f03
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,10 @@
+FROM node:6
+
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+COPY . /usr/src/app
+RUN rm /usr/src/app/.git
+RUN npm install && \
+    node_modules/.bin/bower install --allow-root
+RUN chmod +x selectRpcAndRun.sh
+CMD ["./selectRpcAndRun.sh"]
diff --git a/app/app.js b/app/app.js
index 8a34ef8..2f721b5 100644
--- a/app/app.js
+++ b/app/app.js
@@ -30,6 +30,7 @@ angular.module('ethExplorer', ['ngRoute','ui.bootstrap'])
         var eth_node_url = 'http://localhost:8545'; // TODO: remote URL
 	web3.setProvider(new web3.providers.HttpProvider(eth_node_url));
         $rootScope.web3 = web3;
+        $rootScope.abiDecoder = abiDecoder;
         function sleepFor( sleepDuration ){
             var now = new Date().getTime();
             while(new Date().getTime() < now + sleepDuration){ /* do nothing */ } 
diff --git a/app/index.html b/app/index.html
index dff2268..cd786ef 100644
--- a/app/index.html
+++ b/app/index.html
@@ -9,7 +9,7 @@
   <title>Ethereum Block Explorer</title>
   <meta name="description" content="">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="stylesheet" href="styles/main.css">
+  <link rel="stylesheet" href="./styles/main.css">
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
   <script src="bower_components/web3/dist/web3.min.js"></script>
 
@@ -19,7 +19,7 @@
 <nav class="navbar navbar-inverse navbar-fixed-top">
     <div class="container">
         <div class="navbar-header">
-            <span class="icon-bar"></span><a href="/#/" class="navbar-brand">Ether Block Explorer</a>
+            <span class="icon-bar"></span><a href="./#/" class="navbar-brand">Ether Block Explorer</a>
         </div>
         <div id="navbar" class="navbar-collapse collapse">
             <ul class="nav navbar-nav">
@@ -42,6 +42,7 @@
   <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.4.5/angular.min.js"></script>
   <script src="bower_components/angular-bootstrap/ui-bootstrap.min.js"></script>
   <script src="bower_components/angular-route/angular-route.js"></script>
+  <script src="bower_components/abi-decoder/dist/abi-decoder.js"></script>
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
   <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
 <!--Core-->
diff --git a/app/scripts/controllers/addressInfoController.js b/app/scripts/controllers/addressInfoController.js
index 6b67c04..d9e49c3 100644
--- a/app/scripts/controllers/addressInfoController.js
+++ b/app/scripts/controllers/addressInfoController.js
@@ -2,7 +2,8 @@ angular.module('ethExplorer')
     .controller('addressInfoCtrl', function ($rootScope, $scope, $location, $routeParams, $q) {
 
       var web3 = $rootScope.web3;
-	
+      var abiDecoder = $rootScope.abiDecoder;
+
       $scope.init=function(){
 
         $scope.addressId=$routeParams.addressId;
@@ -28,12 +29,71 @@ angular.module('ethExplorer')
                 deferred.reject(error);
             }
           });
+          getTransactionsByAccount($scope.addressId);
           return deferred.promise;
-        }
+        } // getAddressInfos()
+
+        function getTransactionsByAccount(myaccount, startBlockNumber, endBlockNumber) {
+          if (endBlockNumber == null) {
+            endBlockNumber = web3.eth.blockNumber;
+            // console.log("Using endBlockNumber: " + endBlockNumber);
+          }
+          if (startBlockNumber == null) {
+            startBlockNumber = ( endBlockNumber - 1000 < 0) ? 0: endBlockNumber - 1000;
+            // console.log("Using startBlockNumber: " + startBlockNumber);
+          }
+          console.log("Searching for transactions to/from account \"" + myaccount + "\" within blocks "  + startBlockNumber + " and " + endBlockNumber);
+
+          for (var i = startBlockNumber; i <= endBlockNumber; i++) {
+            if (i % 1000 == 0) {
+              //console.log("Searching block " + i);
+            }
+            var block = web3.eth.getBlock(i, true);
+            if (block != null && block.transactions != null) {
+              $scope.transactions = [];
+              block.transactions.forEach( function(result) {
+                if (myaccount == "*" || myaccount == result.from || myaccount == result.to) {
+                  /* console.log("  tx hash          : " + result.hash + "\n"
+                    + "   nonce           : " + result.nonce + "\n"
+                    + "   blockHash       : " + result.blockHash + "\n"
+                    + "   blockNumber     : " + result.blockNumber + "\n"
+                    + "   transactionIndex: " + result.transactionIndex + "\n"
+                    + "   from            : " + result.from + "\n"
+                    + "   to              : " + result.to + "\n"
+                    + "   value           : " + result.value + "\n"
+                    + "   time            : " + block.timestamp + " " + new Date(block.timestamp * 1000).toGMTString() + "\n"
+                    + "   gasPrice        : " + result.gasPrice + "\n"
+                    + "   gas             : " + result.gas + "\n"
+                    + "   input           : " + result.input); */
+
+                    var transaction = {
+                      id: result.hash,
+                      hash: result.hash,
+                      from: result.from,
+                      to: result.to,
+                      gas: result.gas,
+                      input: result.input,
+                      decoded: decodeData(result.input),
+                      value: result.value
+                    }
 
+                    web3.eth.getTransactionReceipt(result.hash, function (err2, receipt) {
+                      if(!err2) {
+                          for (var attrname in receipt) { transaction[attrname] = receipt[attrname]; }
+                      }
+
+                      $scope.$apply(
+                        $scope.transactions.push(transaction)
+                      );
+                    }); // getTransactionReceipt();
+                } // if tx is for myaccount to or from
+              }) // for each tx in block
+            } // if there is tx in block
+          } // for each block
+        } // getTransactionsByAccount()
 
       };
-      
+
       $scope.init();
 
     });
diff --git a/app/scripts/controllers/blockInfosController.js b/app/scripts/controllers/blockInfosController.js
index 6ef2207..eebcbf3 100644
--- a/app/scripts/controllers/blockInfosController.js
+++ b/app/scripts/controllers/blockInfosController.js
@@ -37,10 +37,11 @@ angular.module('ethExplorer')
                     $scope.number = result.number;
                     $scope.parentHash = result.parentHash;
                     $scope.blockNumber = result.number;
-                    $scope.timestamp = result.timestamp;
+                    $scope.timestamp = result.timestamp + '000';
                     $scope.extraData = result.extraData;
                     $scope.dataFromHex = hex2a(result.extraData);
                     $scope.size = result.size;
+                    $scope.txCount = result.transactions.length;
                     if($scope.blockNumber!==undefined){
                         $scope.conf = number - $scope.blockNumber + " Confirmations";
                         if($scope.conf===0 + " Confirmations"){
@@ -55,9 +56,7 @@ angular.module('ethExplorer')
                             $scope.time = newDate.toUTCString();
                         }
                     }
-
-
-
+                    getTransactions(result);
                 });
 
             } else {
@@ -70,6 +69,7 @@ angular.module('ethExplorer')
 
                 web3.eth.getBlock($scope.blockId,function(error, result) {
                     if(!error) {
+                        //console.debug("getBlockInfos: ", result);
                         deferred.resolve(result);
                     } else {
                         deferred.reject(error);
@@ -79,18 +79,22 @@ angular.module('ethExplorer')
 
             }
 
-
         };
         $scope.init();
 
-        // parse transactions
-        $scope.transactions = []
-        web3.eth.getBlockTransactionCount($scope.blockId, function(error, result){
-          var txCount = result
+        function getTransactions(result) {
+          // TODO: move this to a common js (similar function is in addressInfoController.js)
+          // parse transactions
+          // getBlockTransactionCount doesn't work on testRPC
+          //  web3.eth.getBlockTransactionCount($scope.blockId, function(error, result){
+          //var txCount = result
+
+          txCount = result.transactions.length;
+          $scope.transactions = []
 
           for (var blockIdx = 0; blockIdx < txCount; blockIdx++) {
             web3.eth.getTransactionFromBlock($scope.blockId, blockIdx, function(error, result) {
-
+              // console.debug("getTransactionFromBlock: ", result);
               var transaction = {
                 id: result.hash,
                 hash: result.hash,
@@ -98,14 +102,25 @@ angular.module('ethExplorer')
                 to: result.to,
                 gas: result.gas,
                 input: result.input,
+                decoded: decodeData(result.input),
                 value: result.value
               }
-              $scope.$apply(
-                $scope.transactions.push(transaction)
-              )
-            })
-          }
-        })
+
+              web3.eth.getTransactionReceipt(result.hash, function (err2, receipt) {
+                if(!err2) {
+                    for (var attrname in receipt) { transaction[attrname] = receipt[attrname]; }
+                }
+                //console.log(transaction);
+
+                $scope.$apply(
+                  $scope.transactions.push(transaction)
+                );
+              }); // getTransactionReceipt()
+            }); // getTransactionFromBlock ()
+          } // for each tx in block
+
+        } // getTransactions() for block
+        //}) //getBlockTransactionCount
 
 
 function hex2a(hexx) {
diff --git a/app/scripts/controllers/mainController.js b/app/scripts/controllers/mainController.js
index 7caff26..34448af 100644
--- a/app/scripts/controllers/mainController.js
+++ b/app/scripts/controllers/mainController.js
@@ -1,46 +1,81 @@
+function getBlock(web3, index) {
+	block = web3.eth.getBlock(index);
+	block.timestamp = block.timestamp + '000';
+	return block;
+}
 angular.module('ethExplorer')
-    .controller('mainCtrl', function ($rootScope, $scope, $location) {
+    .controller('mainCtrl', ['$rootScope', '$scope', '$interval', '$location', function ($rootScope, $scope, $interval, $location) {
 
 	var web3 = $rootScope.web3;
-	var maxBlocks = 50; // TODO: into setting file or user select
-	var blockNum = $scope.blockNum = parseInt(web3.eth.blockNumber, 10);
-	if (maxBlocks > blockNum) {
-	    maxBlocks = blockNum + 1;
+	var maxBlocks = 100; // TODO: into setting file or user select
+	var blockNumMax = $scope.blockNum = parseInt(web3.eth.blockNumber, 10);
+	if (maxBlocks > blockNumMax) {
+	    maxBlocks = blockNumMax;
 	}
+    var lastBlockNum = blockNumMax - maxBlocks;
 
 	// get latest 50 blocks
 	$scope.blocks = [];
-	for (var i = 0; i < maxBlocks; ++i) {
-	    $scope.blocks.push(web3.eth.getBlock(blockNum - i));
+	for (var i = lastBlockNum; i <= blockNumMax ; ++i) {
+		$scope.blocks.unshift(getBlock(web3, i));
+		lastBlockNum = i;
 	}
-	
-        $scope.processRequest = function() {
-             var requestStr = $scope.ethRequest.split('0x').join('');
 
-            if (requestStr.length === 40)
-              return goToAddrInfos(requestStr)
-            else if(requestStr.length === 64) {
-              if(/[0-9a-zA-Z]{64}?/.test(requestStr))
-                return goToTxInfos(requestStr)
-              else if(/[0-9]{1,7}?/.test(requestStr))
-                return goToBlockInfos(requestStr)
-            }else if(parseInt(requestStr) > 0)
-              return goToBlockInfos(parseInt(requestStr))
+	stop = $interval(function() {
+		blockNumMax = $scope.blockNum = parseInt(web3.eth.blockNumber, 10);
+		if (lastBlockNum < blockNumMax) {
+			for (var i = lastBlockNum + 1; i <= blockNumMax; ++i) {
+				$scope.blocks.unshift(getBlock(web3, i));
+				lastBlockNum = i;
+				if ($scope.blocks.length > maxBlocks)
+					$scope.blocks.pop();
+			}
+		}
+	}, 7*1000);
 
-            alert('Don\'t know how to handle '+ requestStr)
-        };
+	$scope.$on('$destroy', function() {
+		if (angular.isDefined(stop)) {
+			$interval.cancel(stop);
+			stop = undefined;
+		}
+	});
+  $scope.processRequest = function() {
+       var requestStr = $scope.ethRequest.split('0x').join('');
 
+      if (requestStr.length === 40)
+        return goToAddrInfos(requestStr)
+      else if(requestStr.length === 64) {
+        if(/[0-9a-zA-Z]{64}?/.test(requestStr))
+          return goToTxInfos(requestStr)
+        else if(/[0-9]{1,7}?/.test(requestStr))
+          return goToBlockInfos(requestStr)
+      }else if(parseInt(requestStr) > 0)
+        return goToBlockInfos(parseInt(requestStr))
 
-        function goToBlockInfos(requestStr) {
-            $location.path('/block/'+requestStr);
-        }
+      alert('Don\'t know how to handle '+ requestStr)
+  };
 
-        function goToAddrInfos(requestStr) {
-            $location.path('/address/'+requestStr);
-        }
+  function goToBlockInfos(requestStr) {
+      $location.path('/block/'+requestStr);
+  }
 
-         function goToTxInfos (requestStr) {
-             $location.path('/transaction/'+requestStr);
-        }
+  function goToAddrInfos(requestStr) {
+      $location.path('/address/'+requestStr);
+  }
 
-    });
+  function goToTxInfos (requestStr) {
+       $location.path('/transaction/'+requestStr);
+  }
+
+
+
+}]);
+
+function decodeData(data) {
+	// TODO: move this a service
+	// TODO: how could we read ABIs generated by truffle? (build/contracts )
+		abiDecoder.addABI(
+			[ { "constant": true, "inputs": [ { "name": "_roundId", "type": "uint256" } ], "name": "getWinnablePot", "outputs": [ { "name": "_winnablePot", "type": "uint256" } ], "payable": false, "type": "function" }, { "constant": true, "inputs": [], "name": "latestRoundId", "outputs": [ { "name": "_roundId", "type": "uint256" } ], "payable": false, "type": "function" }, { "constant": false, "inputs": [ { "name": "_new", "type": "address" } ], "name": "setOwner", "outputs": [], "payable": false, "type": "function" }, { "constant": true, "inputs": [], "name": "getGameInfo", "outputs": [ { "name": "_roundsCount", "type": "uint256" }, { "name": "_latestRoundId", "type": "uint256" }, { "name": "_nextRoundLength", "type": "uint256" }, { "name": "_nextRoundRequiredBetAmount", "type": "uint256" }, { "name": "_nextRoundFee", "type": "uint256" } ], "payable": false, "type": "function" }, { "constant": false, "inputs": [ { "name": "forceClose", "type": "bool" } ], "name": "checkAndCloseRound", "outputs": [ { "name": "result", "type": "int16" } ], "payable": false, "type": "function" }, { "constant": false, "inputs": [ { "name": "queryId", "type": "bytes32" }, { "name": "result", "type": "string" } ], "name": "__callback", "outputs": [], "payable": false, "type": "function" }, { "constant": false, "inputs": [ { "name": "myid", "type": "bytes32" }, { "name": "result", "type": "string" }, { "name": "proof", "type": "bytes" } ], "name": "__callback", "outputs": [], "payable": false, "type": "function" }, { "constant": true, "inputs": [ { "name": "roundId", "type": "uint256" }, { "name": "value", "type": "uint256" } ], "name": "verifyBet", "outputs": [ { "name": "result", "type": "uint8" } ], "payable": false, "type": "function" }, { "constant": false, "inputs": [ { "name": "roundId", "type": "uint256" }, { "name": "encryptedBet", "type": "string" } ], "name": "placeBet", "outputs": [ { "name": "queryId", "type": "bytes32" } ], "payable": true, "type": "function" }, { "constant": true, "inputs": [ { "name": "roundId", "type": "uint256" } ], "name": "getRequiredBetAmount", "outputs": [ { "name": "ret", "type": "uint256" } ], "payable": false, "type": "function" }, { "constant": true, "inputs": [ { "name": "_dataSource", "type": "string" } ], "name": "getOraclizePrice", "outputs": [ { "name": "", "type": "uint256" } ], "payable": false, "type": "function" }, { "constant": true, "inputs": [ { "name": "roundId", "type": "uint256" } ], "name": "getRoundInfo", "outputs": [ { "name": "_isActive", "type": "bool" }, { "name": "_requiredBetAmount", "type": "uint256" }, { "name": "_revealTime", "type": "uint256" }, { "name": "_roundLength", "type": "uint256" }, { "name": "_betCount", "type": "uint256" }, { "name": "_revealedBetCount", "type": "uint256" }, { "name": "_unReveleadBetCount", "type": "uint256" }, { "name": "_winningAddress", "type": "address" }, { "name": "_smallestNumber", "type": "uint256" }, { "name": "_winnablePot", "type": "uint256" }, { "name": "_fee", "type": "uint256" } ], "payable": false, "type": "function" }, { "constant": false, "inputs": [ { "name": "_nextRoundRequiredBetAmount", "type": "uint256" } ], "name": "setNextRoundRequiredBetAmount", "outputs": [], "payable": false, "type": "function" }, { "constant": true, "inputs": [], "name": "owner", "outputs": [ { "name": "", "type": "address" } ], "payable": false, "type": "function" }, { "constant": true, "inputs": [ { "name": "_roundId", "type": "uint256" } ], "name": "getFeeAmount", "outputs": [ { "name": "_feeAmount", "type": "uint256" } ], "payable": false, "type": "function" }, { "constant": false, "inputs": [], "name": "startNewRound", "outputs": [ { "name": "newRoundId", "type": "uint256" } ], "payable": false, "type": "function" }, { "constant": true, "inputs": [ { "name": "roundId", "type": "uint256" }, { "name": "playerAddress", "type": "address" } ], "name": "getBet", "outputs": [ { "name": "_didBet", "type": "bool" }, { "name": "_betNumber", "type": "uint256" }, { "name": "_didWin", "type": "bool" } ], "payable": false, "type": "function" }, { "constant": true, "inputs": [ { "name": "_roundId", "type": "uint256" } ], "name": "getTotalPot", "outputs": [ { "name": "_totalPot", "type": "uint256" } ], "payable": false, "type": "function" }, { "constant": false, "inputs": [ { "name": "_nextRoundLength", "type": "uint256" } ], "name": "setNextRoundLength", "outputs": [], "payable": false, "type": "function" }, { "constant": false, "inputs": [ { "name": "_nextRoundFee", "type": "uint32" } ], "name": "setNextRoundFee", "outputs": [], "payable": false, "type": "function" }, { "inputs": [], "payable": true, "type": "constructor" }, { "payable": true, "type": "fallback" }, { "anonymous": false, "inputs": [ { "indexed": true, "name": "_roundId", "type": "uint256" }, { "indexed": true, "name": "_from", "type": "address" }, { "indexed": false, "name": "_queryId", "type": "bytes32" } ], "name": "e_betPlaced", "type": "event" }, { "anonymous": false, "inputs": [ { "indexed": true, "name": "_roundId", "type": "uint256" }, { "indexed": true, "name": "_from", "type": "address" }, { "indexed": false, "name": "_queryId", "type": "bytes32" }, { "indexed": false, "name": "_betNumber", "type": "uint256" } ], "name": "e_betRevealed", "type": "event" }, { "anonymous": false, "inputs": [ { "indexed": true, "name": "_roundId", "type": "uint256" }, { "indexed": false, "name": "_winnerAddress", "type": "address" }, { "indexed": false, "name": "_winningNumber", "type": "uint256" }, { "indexed": false, "name": "_numberOfBets", "type": "uint256" }, { "indexed": false, "name": "_numberOfUnRevealedBets", "type": "uint256" }, { "indexed": false, "name": "_numberOfInvalidBets", "type": "uint256" } ], "name": "e_roundClosed", "type": "event" }, { "anonymous": false, "inputs": [ { "indexed": true, "name": "_roundId", "type": "uint256" }, { "indexed": false, "name": "_requiredBetAmount", "type": "uint256" }, { "indexed": false, "name": "_revealTime", "type": "uint256" } ], "name": "e_roundStarted", "type": "event" }, { "anonymous": false, "inputs": [ { "indexed": false, "name": "_errorMsg", "type": "string" } ], "name": "e_error", "type": "event" }, { "anonymous": false, "inputs": [ { "indexed": true, "name": "_from", "type": "address" }, { "indexed": false, "name": "_amount", "type": "uint256" } ], "name": "e_fundsReceived", "type": "event" }, { "anonymous": false, "inputs": [ { "indexed": true, "name": "_roundId", "type": "uint256" }, { "indexed": false, "name": "_settingName", "type": "string" }, { "indexed": false, "name": "_oldValue", "type": "uint256" }, { "indexed": false, "name": "_newValue", "type": "uint256" } ], "name": "e_settingChange", "type": "event" }, { "anonymous": false, "inputs": [ { "indexed": true, "name": "old", "type": "address" }, { "indexed": true, "name": "current", "type": "address" } ], "name": "NewOwner", "type": "event" } ]);
+		var decoded = abiDecoder.decodeMethod(data);
+		return JSON.stringify(decoded, null, 4);
+} // decodeData(data)
diff --git a/app/scripts/controllers/transactionInfosController.js b/app/scripts/controllers/transactionInfosController.js
index 468ceae..b3fe673 100644
--- a/app/scripts/controllers/transactionInfosController.js
+++ b/app/scripts/controllers/transactionInfosController.js
@@ -2,7 +2,7 @@ angular.module('ethExplorer')
     .controller('transactionInfosCtrl', function ($rootScope, $scope, $location, $routeParams,$q) {
 
        var web3 = $rootScope.web3;
-	
+
         $scope.init=function()
         {
             $scope.txId=$routeParams.transactionId;
@@ -30,13 +30,17 @@ angular.module('ethExplorer')
                     }
                     $scope.from = result.from;
                     $scope.gas = result.gas;
+                    $scope.gasUsed = result.gasUsed;
+                    $scope.contractAddress = result.contractAddress;
                     $scope.gasPrice = result.gasPrice.c[0] + " WEI";
                     $scope.hash = result.hash;
                     $scope.input = result.input; // that's a string
+                    $scope.decoded = decodeData(result.input);
                     $scope.nonce = result.nonce;
                     $scope.to = result.to;
                     $scope.transactionIndex = result.transactionIndex;
-                    $scope.ethValue = result.value.c[0] / 10000; 
+                    $scope.ethValue = result.value.c[0] / 10000;
+                    console.log(result);
                     $scope.txprice = (result.gas * result.gasPrice)/1000000000000000000 + " ETH";
                     if($scope.blockNumber!==undefined){
                         $scope.conf = number - $scope.blockNumber;
@@ -48,7 +52,7 @@ angular.module('ethExplorer')
                     if($scope.blockNumber!==undefined){
                         var info = web3.eth.getBlock($scope.blockNumber);
                         if(info!==undefined){
-                            $scope.time = info.timestamp;
+                            $scope.time = info.timestamp + '000';
                         }
                     }
 
@@ -68,7 +72,12 @@ angular.module('ethExplorer')
 
                 web3.eth.getTransaction($scope.txId,function(error, result) {
                     if(!error){
-                        deferred.resolve(result);
+                        web3.eth.getTransactionReceipt($scope.txId,function(err2, receipt) {
+                            if(!err2) {
+                                for (var attrname in receipt) { result[attrname] = receipt[attrname]; }
+                            }
+                            deferred.resolve(result);
+                        });
                     }
                     else{
                         deferred.reject(error);
@@ -78,8 +87,6 @@ angular.module('ethExplorer')
 
             }
 
-
-
         };
         $scope.init();
         console.log($scope.result);
diff --git a/app/scripts/mainController.js b/app/scripts/mainController.js
new file mode 100644
index 0000000..899b8bb
--- /dev/null
+++ b/app/scripts/mainController.js
@@ -0,0 +1,234 @@
+function getBlock(web3, index) {
+	block = web3.eth.getBlock(index);
+	block.timestamp = block.timestamp + '000';
+	return block;
+}
+angular.module('ethExplorer')
+    .controller('mainCtrl', ['$rootScope', '$scope', '$interval', '$location', function ($rootScope, $scope, $interval, $location) {
+
+	var web3 = $rootScope.web3;
+	var maxBlocks = 100; // TODO: into setting file or user select
+	var blockNumMax = $scope.blockNum = parseInt(web3.eth.blockNumber, 10);
+	if (maxBlocks > blockNumMax) {
+	    maxBlocks = blockNumMax;
+	}
+    var lastBlockNum = blockNumMax - maxBlocks;
+
+	// get latest 50 blocks
+	$scope.blocks = [];
+	for (var i = lastBlockNum; i <= blockNumMax ; ++i) {
+		$scope.blocks.unshift(getBlock(web3, i));
+		lastBlockNum = i;
+	}
+
+	stop = $interval(function() {
+		blockNumMax = $scope.blockNum = parseInt(web3.eth.blockNumber, 10);
+		if (lastBlockNum < blockNumMax) {
+			for (var i = lastBlockNum + 1; i <= blockNumMax; ++i) {
+				$scope.blocks.unshift(getBlock(web3, i));
+				lastBlockNum = i;
+				if ($scope.blocks.length > maxBlocks)
+					$scope.blocks.pop();
+			}
+		}
+	}, 7*1000);
+
+	$scope.$on('$destroy', function() {
+		if (angular.isDefined(stop)) {
+			$interval.cancel(stop);
+			stop = undefined;
+		}
+	});
+  $scope.processRequest = function() {
+       var requestStr = $scope.ethRequest.split('0x').join('');
+
+      if (requestStr.length === 40)
+        return goToAddrInfos(requestStr)
+      else if(requestStr.length === 64) {
+        if(/[0-9a-zA-Z]{64}?/.test(requestStr))
+          return goToTxInfos(requestStr)
+        else if(/[0-9]{1,7}?/.test(requestStr))
+          return goToBlockInfos(requestStr)
+      }else if(parseInt(requestStr) > 0)
+        return goToBlockInfos(parseInt(requestStr))
+
+      alert('Don\'t know how to handle '+ requestStr)
+  };
+
+  function goToBlockInfos(requestStr) {
+      $location.path('/block/'+requestStr);
+  }
+
+  function goToAddrInfos(requestStr) {
+      $location.path('/address/'+requestStr);
+  }
+
+  function goToTxInfos (requestStr) {
+       $location.path('/transaction/'+requestStr);
+  }
+
+
+
+}]);
+
+function decodeData(data) {
+	// TODO: move this a service
+	// TODO: how could we read ABIs generated by truffle? (build/contracts )
+		abiDecoder.addABI(
+			[ { constant: true,
+			    inputs: [ [Object] ],
+			    name: 'getWinnablePot',
+			    outputs: [ [Object] ],
+			    payable: false,
+			    type: 'function' },
+			  { constant: false,
+			    inputs: [ [Object] ],
+			    name: 'setOwner',
+			    outputs: [],
+			    payable: false,
+			    type: 'function' },
+			  { constant: true,
+			    inputs: [],
+			    name: 'getGameInfo',
+			    outputs: [ [Object], [Object], [Object], [Object], [Object] ],
+			    payable: false,
+			    type: 'function' },
+			  { constant: false,
+			    inputs: [ [Object] ],
+			    name: 'checkAndCloseRound',
+			    outputs: [ [Object] ],
+			    payable: false,
+			    type: 'function' },
+			  { constant: false,
+			    inputs: [ [Object], [Object] ],
+			    name: '__callback',
+			    outputs: [],
+			    payable: false,
+			    type: 'function' },
+			  { constant: false,
+			    inputs: [ [Object], [Object], [Object] ],
+			    name: '__callback',
+			    outputs: [],
+			    payable: false,
+			    type: 'function' },
+			  { constant: true,
+			    inputs: [ [Object], [Object] ],
+			    name: 'verifyBet',
+			    outputs: [ [Object] ],
+			    payable: false,
+			    type: 'function' },
+			  { constant: false,
+			    inputs: [ [Object], [Object] ],
+			    name: 'placeBet',
+			    outputs: [ [Object] ],
+			    payable: true,
+			    type: 'function' },
+			  { constant: true,
+			    inputs: [ [Object] ],
+			    name: 'getRoundInfo',
+			    outputs:
+			     [ [Object],
+			       [Object],
+			       [Object],
+			       [Object],
+			       [Object],
+			       [Object],
+			       [Object],
+			       [Object],
+			       [Object],
+			       [Object],
+			       [Object],
+			       [Object] ],
+			    payable: false,
+			    type: 'function' },
+			  { constant: false,
+			    inputs: [ [Object] ],
+			    name: 'setNextRoundRequiredBetAmount',
+			    outputs: [],
+			    payable: false,
+			    type: 'function' },
+			  { constant: true,
+			    inputs: [],
+			    name: 'owner',
+			    outputs: [ [Object] ],
+			    payable: false,
+			    type: 'function' },
+			  { constant: true,
+			    inputs: [ [Object] ],
+			    name: 'getFeeAmount',
+			    outputs: [ [Object] ],
+			    payable: false,
+			    type: 'function' },
+			  { constant: true,
+			    inputs: [],
+			    name: 'getOraclizeCbAddress',
+			    outputs: [ [Object] ],
+			    payable: false,
+			    type: 'function' },
+			  { constant: false,
+			    inputs: [],
+			    name: 'startNewRound',
+			    outputs: [ [Object] ],
+			    payable: false,
+			    type: 'function' },
+			  { constant: true,
+			    inputs: [ [Object], [Object] ],
+			    name: 'getBet',
+			    outputs: [ [Object], [Object], [Object] ],
+			    payable: false,
+			    type: 'function' },
+			  { constant: true,
+			    inputs: [ [Object] ],
+			    name: 'getTotalPot',
+			    outputs: [ [Object] ],
+			    payable: false,
+			    type: 'function' },
+			  { constant: false,
+			    inputs: [ [Object] ],
+			    name: 'setNextRoundLength',
+			    outputs: [],
+			    payable: false,
+			    type: 'function' },
+			  { constant: false,
+			    inputs: [ [Object] ],
+			    name: 'setNextRoundFee',
+			    outputs: [],
+			    payable: false,
+			    type: 'function' },
+			  { inputs: [], payable: true, type: 'constructor' },
+			  { payable: true, type: 'fallback' },
+			  { anonymous: false,
+			    inputs: [ [Object], [Object], [Object] ],
+			    name: 'e_betPlaced',
+			    type: 'event' },
+			  { anonymous: false,
+			    inputs: [ [Object], [Object], [Object], [Object] ],
+			    name: 'e_betRevealed',
+			    type: 'event' },
+			  { anonymous: false,
+			    inputs: [ [Object], [Object], [Object], [Object], [Object], [Object] ],
+			    name: 'e_roundClosed',
+			    type: 'event' },
+			  { anonymous: false,
+			    inputs: [ [Object], [Object], [Object] ],
+			    name: 'e_roundStarted',
+			    type: 'event' },
+			  { anonymous: false,
+			    inputs: [ [Object] ],
+			    name: 'e_error',
+			    type: 'event' },
+			  { anonymous: false,
+			    inputs: [ [Object], [Object] ],
+			    name: 'e_fundsReceived',
+			    type: 'event' },
+			  { anonymous: false,
+			    inputs: [ [Object], [Object], [Object], [Object] ],
+			    name: 'e_settingChange',
+			    type: 'event' },
+			  { anonymous: false,
+			    inputs: [ [Object], [Object] ],
+			    name: 'NewOwner',
+			    type: 'event' } ];
+		var decoded = abiDecoder.decodeMethod(data);
+		return JSON.stringify(decoded, null, 4);
+} // decodeData(data)
diff --git a/app/views/addressInfo.html b/app/views/addressInfo.html
index 5c729d9..b0ba9cb 100644
--- a/app/views/addressInfo.html
+++ b/app/views/addressInfo.html
@@ -1,28 +1,80 @@
 <div class="container" style="padding-top: 50px;">
-<h1>Address
-    <small>View information about an Ethereum Address</small>
-</h1>
+  <h1>Address
+      <small>View information about an Ethereum Address</small>
+  </h1>
 
-<div id="address-97785883" class="addressdiv">
-    <table class="table table-striped" cellpadding="0" cellspacing="0" style="padding:0px;float:left;margin:0px;width:100%">
+  <div id="address-97785883" class="addressdiv">
+      <table class="table table-striped" cellpadding="0" cellspacing="0" style="padding:0px;float:left;margin:0px;width:100%">
+          <tbody>
+          <tr>
+              <th colspan="3" align="left">{{addressId}} <span class="pull-right"></span></th>
+          </tr>
+          </tbody>
+      </table>
+      <table class="table table-striped">
+          <tbody>
+          <tr>
+              <td>Balance (Wei)</td>
+              <td>{{balance}}</a></td>
+          </tr>
+          <tr>
+              <td>Balance (Ether)</td>
+              <td>{{balanceInEther}}</a></td>
+          </tr>
+          </tbody>
+      </table>
+
+  </div>
+
+  <h2 style="margin-top: 30px;">
+    Transactions
+    <small>- for/to this address (last 1000 blocks)</small>
+  </h2>
+
+  <div ng-repeat="tx in transactions">
+    <table class="table table-striped">
         <tbody>
         <tr>
-            <th colspan="3" align="left">{{addressId}} <span class="pull-right"></span></th>
+            <th colspan="2" style="text-align:left">Transaction #{{$index+1}}</th>
+        </tr>
+        <tr>
+            <td>Hash #</td>
+            <td><a href="./#/transaction/{{tx.hash}}">{{tx.hash}}</a></td>
+        </tr>
+        <tr>
+            <td>From</td>
+            <td><a href="./#/address/{{tx.from}}">{{tx.from}}</a></td>
         </tr>
-        </tbody>
-    </table>
-    <table class="table table-striped">
-        <tbody>
         <tr>
-            <td>Balance (Wei)</td>
-            <td>{{balance}}</a></td>
+            <td>To</td>
+            <td><a href="./#/address/{{tx.to}}">{{tx.to}}</a></td>
         </tr>
         <tr>
-            <td>Balance (Ether)</td>
-            <td>{{balanceInEther}}</a></td>
+            <td>Contract Address</td>
+            <td><a href="./#/address/{{tx.contractAddress}}">{{tx.contractAddress || '??'}}</a></td>
+        </tr>
+        <tr>
+            <td>Gas Sent</td>
+            <td>{{tx.gas}}</a></td>
+        </tr>
+        <tr>
+            <td>Gas Used</td>
+            <td>{{tx.gasUsed || '??'}}</a></td>
+        </tr>
+        <tr>
+            <td>Input</td>
+            <td>{{tx.input}}</a></td>
+        </tr>
+        <tr>
+            <td>Decoded Input</td>
+            <td><pre>{{tx.decoded}}</pre></td>
+        </tr>
+        <tr>
+            <td>Value</td>
+            <td>{{tx.value}}</a></td>
         </tr>
         </tbody>
     </table>
-</div>
+  </div>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/blockInfos.html b/app/views/blockInfos.html
index 03f8339..fdf0e57 100644
--- a/app/views/blockInfos.html
+++ b/app/views/blockInfos.html
@@ -27,7 +27,7 @@ <h1>Block
             <tr>
                 <td>Received Time</td>
                 <td>
-                    {{timestamp}}
+                    {{timestamp | date:'yyyy-MM-dd HH:mm:ss Z'}}
                 </td>
             </tr>
             <tr>
@@ -52,6 +52,10 @@ <h1>Block
                 <td>Gas Limit</td>
                 <td>{{gasLimit}}</td>
             </tr>
+            <tr>
+                <td>Tx Count</td>
+                <td>{{txCount}}</td>
+            </tr>
             <tr>
                 <td>Data</td>
                 <td>{{extraData}}</td>
@@ -90,16 +94,28 @@ <h2 style="margin-top: 30px;">
               <td><a href="./#/address/{{tx.to}}">{{tx.to}}</a></td>
           </tr>
           <tr>
-              <td>Gas</td>
+              <td>Value</td>
+              <td>{{tx.value}}</a></td>
+          </tr>
+          <tr>
+              <td>Contract Address</td>
+              <td><a href="./#/address/{{tx.contractAddress}}">{{tx.contractAddress || '??'}}</a></td>
+          </tr>
+          <tr>
+              <td>Gas Sent</td>
               <td>{{tx.gas}}</a></td>
           </tr>
+          <tr>
+              <td>Gas Used</td>
+              <td>{{tx.gasUsed || '??'}}</a></td>
+          </tr>
           <tr>
               <td>Input</td>
               <td>{{tx.input}}</a></td>
           </tr>
           <tr>
-              <td>Value</td>
-              <td>{{tx.value}}</a></td>
+              <td>Decoded Input</td>
+              <td><pre>{{tx.decoded}}</pre></td>
           </tr>
           </tbody>
       </table>
diff --git a/app/views/main.html b/app/views/main.html
index b2f74af..016bb40 100644
--- a/app/views/main.html
+++ b/app/views/main.html
@@ -1,9 +1,7 @@
 <div class="container" style="padding-top: 50px;">
 
-    <h1 style="text-align:center;">Welcome to the Etherparty Block Explorer!</h1>
-
     <h4 style="text-align:center; margin-top: 30px;">
-      <a href="/#/block/{{blockNum}}">Latest Block: {{blockNum}}</a>
+      <a href="./#/block/{{blockNum}}">Latest Block: {{blockNum}}</a>
     </h4>
 
     <table class="table table-striped" cellpadding="0" cellspacing="0" style="padding:0px;float:left;margin:0px;width:100%">
@@ -15,10 +13,10 @@ <h4 style="text-align:center; margin-top: 30px;">
 	  <th>Timestamp</th>
 	</tr>
 	<tr data-ng-repeat="i in blocks">
-	  <td><a href="/#/block/{{i.number}}">{{i.number}}</a></td>
+	  <td><a href="./#/block/{{i.number}}">{{i.number}}</a></td>
 	  <td>{{i.transactions.length}}</td>
 	  <td>{{i.size}}</td>
-	  <td>{{i.timestamp}}</td>
+	  <td>{{i.timestamp | date:'yyyy-MM-dd HH:mm:ss Z'}}</td>
         </tr>
 
       </tbody>
diff --git a/app/views/transactionInfos.html b/app/views/transactionInfos.html
index 40e59e9..ca6f633 100644
--- a/app/views/transactionInfos.html
+++ b/app/views/transactionInfos.html
@@ -43,7 +43,7 @@ <h1>Transaction
             <tr>
                 <td>Received Time</td>
                 <td>
-                    {{time}}
+                    {{time | date:'yyyy-MM-dd HH:mm:ss Z'}}
                 </td>
             </tr>
             <tr>
@@ -53,9 +53,17 @@ <h1>Transaction
                 </td>
             </tr>
             <tr>
-                <td>Gas Used</td>
+                <td>Contract Address</td>
+                <td><a href="./#/address/{{contractAddress}}">{{contractAddress || '??'}}</a></td>
+            </tr>
+            <tr>
+                <td>Gas Sent</td>
                 <td>{{gas}}</td>
             </tr>
+            <tr>
+                <td>Gas Used</td>
+                <td>{{gasUsed || '??'}}</td>
+            </tr>
             <tr>
                 <td>Gas Price</td>
                 <td>{{gasPrice}}</td>
@@ -69,9 +77,13 @@ <h1>Transaction
                 <td>{{txprice}}</td>
             </tr>
             <tr>
-                <td>Data</td>
+                <td>Input</td>
                 <td>{{input}}</td>
             </tr>
+            <tr>
+                <td>Decoded input</td>
+                <td><pre>{{decoded}}</pre></td>
+            </tr>
 
 
             </tbody>
diff --git a/bower.json b/bower.json
index dcb3962..d6cdc63 100644
--- a/bower.json
+++ b/bower.json
@@ -12,6 +12,7 @@
     "angular-mocks": "~1.4.0",
     "html5-boilerplate": "~5.2.0",
     "web3": "~0.14.0",
-    "angular-bootstrap": "~0.13.3"
+    "angular-bootstrap": "~0.13.3",
+    "abi-decoder": "1.0.8"
   }
 }
diff --git a/package.json b/package.json
index 1eb6d18..664867a 100644
--- a/package.json
+++ b/package.json
@@ -15,24 +15,20 @@
     "karma-jasmine": "^0.3.5",
     "karma-junit-reporter": "^0.2.2",
     "protractor": "^2.1.0",
-    "shelljs": "^0.2.6"
+    "shelljs": "^0.2.6",
+    "ethereum-input-data-decoder": "0.0.2"
   },
   "scripts": {
     "postinstall": "bower install",
-
     "prestart": "npm install",
     "start": "http-server ./app -a localhost -p 8000 -c-1",
-
     "pretest": "npm install",
     "test": "karma start karma.conf.js",
     "test-single-run": "karma start karma.conf.js  --single-run",
-
     "preupdate-webdriver": "npm install",
     "update-webdriver": "webdriver-manager update",
-
     "preprotractor": "npm run update-webdriver",
     "protractor": "protractor e2e-tests/protractor.conf.js",
-
     "update-index-async": "node -e \"require('shelljs/global'); sed('-i', /\\/\\/@@NG_LOADER_START@@[\\s\\S]*\\/\\/@@NG_LOADER_END@@/, '//@@NG_LOADER_START@@\\n' + sed(/sourceMappingURL=angular-loader.min.js.map/,'sourceMappingURL=bower_components/angular-loader/angular-loader.min.js.map','app/bower_components/angular-loader/angular-loader.min.js') + '\\n//@@NG_LOADER_END@@', 'app/index-async.html');\""
   }
 }
diff --git a/selectRpcAndRun.sh b/selectRpcAndRun.sh
new file mode 100755
index 0000000..3f060dd
--- /dev/null
+++ b/selectRpcAndRun.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ "$WEB3_RPC" != "" ]; then
+	mv app/app.js app/app.js.orig
+	cat app/app.js.orig | sed "s|http://localhost:8545|$WEB3_RPC|" > app/app.js
+fi
+
+node_modules/http-server/bin/http-server ./app -a 0.0.0.0 -p 8000 -c-1
\ No newline at end of file